diff options
author | Thomas Preud'homme <robotux@celest.fr> | 2019-02-03 00:10:52 +0000 |
---|---|---|
committer | Thomas Preud'homme <robotux@celest.fr> | 2019-02-03 00:10:52 +0000 |
commit | 9b10c21f5cad0e2ec27d23c59e65af7141a226f3 (patch) | |
tree | bf81d75a9ed990bb76488c502767600fcf7550b7 | |
parent | 594fcba67600704bee9115c86e18927b2237b304 (diff) |
New upstream version 1.6.1.3
187 files changed, 13185 insertions, 11448 deletions
diff --git a/CopyEngineManager.cpp b/CopyEngineManager.cpp index a3934b3..fc1ec95 100644 --- a/CopyEngineManager.cpp +++ b/CopyEngineManager.cpp @@ -120,6 +120,7 @@ void CopyEngineManager::onePluginAdded(const PluginsAvailable &plugin) #endif // ULTRACOPIER_DEBUG newItem.options=new LocalPluginOptions("CopyEngine-"+newItem.name); newItem.factory->setResources(newItem.options,plugin.writablePath,plugin.path,&FacilityEngine::facilityEngine,ULTRACOPIER_VERSION_PORTABLE_BOOL); + connect(OptionEngine::optionEngine,&OptionEngine::resetOptions,newItem.factory,&PluginInterface_CopyEngineFactory::resetOptions); newItem.optionsWidget=newItem.factory->options(); newItem.supportedProtocolsForTheSource=newItem.factory->supportedProtocolsForTheSource(); newItem.supportedProtocolsForTheDestination=newItem.factory->supportedProtocolsForTheDestination(); @@ -1141,7 +1141,8 @@ void Core::urlDropped(const std::vector<std::string> &urls) { if(copyList.at(index).ignoreMode) { - QMessageBox::StandardButton reply=QMessageBox::question(copyList.at(index).interface,tr("Transfer mode"),tr("Do you want to copy? If no, it will be moved."),QMessageBox::Yes|QMessageBox::No|QMessageBox::Cancel,QMessageBox::Cancel); + QMessageBox::StandardButton reply=QMessageBox::question(copyList.at(index).interface,tr("Transfer mode"), + tr("Do you want to copy? If no, it will be moved."),QMessageBox::Yes|QMessageBox::No|QMessageBox::Cancel,QMessageBox::Cancel); if(reply==QMessageBox::Yes) copyList.at(index).engine->newCopy(sources); if(reply==QMessageBox::No) diff --git a/EventDispatcher.cpp b/EventDispatcher.cpp index b2595fb..c3fc61f 100644 --- a/EventDispatcher.cpp +++ b/EventDispatcher.cpp @@ -14,6 +14,7 @@ #include "CompilerInfo.h" #include "ThemesManager.h" #include "cpp11addition.h" +#include "ProductKey.h" #ifdef Q_OS_UNIX #include <unistd.h> @@ -37,10 +38,6 @@ #include <QDomElement> #endif -#ifdef ULTRACOPIER_VERSION_ULTIMATE -#include <QInputDialog> -#endif - /// \brief Initiate the ultracopier event dispatcher and check if no other session is running EventDispatcher::EventDispatcher() { @@ -166,49 +163,6 @@ EventDispatcher::EventDispatcher() if(a>5) OptionEngine::optionEngine->setOptionValue("Ultracopier","GroupWindowWhen","0"); - #ifdef ULTRACOPIER_VERSION_ULTIMATE - #ifdef ULTRACOPIER_ILLEGAL - static bool crackedVersion=true; - #else - static bool crackedVersion=false; - #endif - if(!crackedVersion) - { - while(1) - { - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"ultimate key"); - QString key=QString::fromStdString(OptionEngine::optionEngine->getOptionValue("Ultracopier","key")); - if(!key.isEmpty()) - { - QCryptographicHash hash(QCryptographicHash::Sha224); - hash.addData(QStringLiteral("U2NgvbKVrVwlaXnx").toUtf8()); - hash.addData(key.toUtf8()); - const QByteArray &result=hash.result(); - if(!result.isEmpty() && result.at(0)==0x00 && result.at(1)==0x00) - break; - } - key=QInputDialog::getText(NULL,tr("Key"),tr("Give the key of this software, more information on <a href=\"http://ultracopier.first-world.info/\">ultracopier.first-world.info</a>")); - if(key.isEmpty()) - { - QCoreApplication::quit(); - stopIt=true; - return; - } - { - QCryptographicHash hash(QCryptographicHash::Sha224); - hash.addData(QStringLiteral("U2NgvbKVrVwlaXnx").toUtf8()); - hash.addData(key.toUtf8()); - const QByteArray &result=hash.result(); - if(!result.isEmpty() && result.at(0)==0x00 && result.at(1)==0x00) - { - OptionEngine::optionEngine->setOptionValue("Ultracopier","key",key.toStdString()); - break; - } - } - } - } - #endif - connect(&cliParser, &CliParser::newTransferList,core, &Core::newTransferList); } @@ -322,6 +276,16 @@ void EventDispatcher::initFunction() std::cerr << "connect error at " << __FILE__ << ":" << std::to_string(__LINE__) << std::endl; abort(); } + if(!connect(backgroundIcon, &SystrayIcon::showProductKey, ProductKey::productKey, &ProductKey::show,Qt::DirectConnection)) + { + std::cerr << "connect error at " << __FILE__ << ":" << std::to_string(__LINE__) << std::endl; + abort(); + } + if(!connect(ProductKey::productKey, &ProductKey::changeToUltimate,backgroundIcon, &SystrayIcon::changeToUltimate,Qt::DirectConnection)) + { + std::cerr << "connect error at " << __FILE__ << ":" << std::to_string(__LINE__) << std::endl; + abort(); + } if(!connect(&cliParser, &CliParser::showOptions, &optionDialog, &OptionDialog::show,Qt::DirectConnection)) { std::cerr << "connect error at " << __FILE__ << ":" << std::to_string(__LINE__) << std::endl; @@ -385,6 +349,21 @@ void EventDispatcher::initFunction() std::cerr << "connect error at " << __FILE__ << ":" << std::to_string(__LINE__) << std::endl; abort(); } + if(!connect(&theHelp,&HelpDialog::checkUpdate, &internetUpdater,&InternetUpdater::checkUpdate)) + { + std::cerr << "connect error at " << __FILE__ << ":" << std::to_string(__LINE__) << std::endl; + abort(); + } + if(!connect(&internetUpdater,&InternetUpdater::newUpdate, &theHelp,&HelpDialog::newUpdate)) + { + std::cerr << "connect error at " << __FILE__ << ":" << std::to_string(__LINE__) << std::endl; + abort(); + } + if(!connect(&internetUpdater,&InternetUpdater::noNewUpdate, &theHelp,&HelpDialog::noNewUpdate)) + { + std::cerr << "connect error at " << __FILE__ << ":" << std::to_string(__LINE__) << std::endl; + abort(); + } #endif copyEngineList->setIsConnected(); copyServer->resendState(); diff --git a/FacilityEngine.cpp b/FacilityEngine.cpp index 8356f05..185492a 100644 --- a/FacilityEngine.cpp +++ b/FacilityEngine.cpp @@ -5,6 +5,7 @@ \licence GPL3, see the file COPYING */ #include "FacilityEngine.h" +#include "ProductKey.h" #if defined (Q_OS_WIN32) #ifndef NOMINMAX @@ -229,15 +230,21 @@ std::string FacilityEngine::simplifiedRemainingTime(const uint32_t &seconds) con /// \brief Return ultimate url, empty is not found or already ultimate std::string FacilityEngine::ultimateUrl() const { - #ifdef ULTRACOPIER_VERSION_ULTIMATE - return std::string(); - #else + if(ProductKey::productKey->isUltimate()) + return std::string(); + else + { #if defined(Q_OS_WIN32) || defined(Q_OS_MAC) - return "http://ultracopier.first-world.info/shop.html"; + return "https://shop.first-world.info/"; #else return std::string(); #endif - #endif + } +} + +bool FacilityEngine::isUltimate() const +{ + return ProductKey::productKey->isUltimate(); } /// \brief Return the software name diff --git a/FacilityEngine.h b/FacilityEngine.h index 5b6c6a9..ce4bb36 100644 --- a/FacilityEngine.h +++ b/FacilityEngine.h @@ -45,6 +45,8 @@ public: std::string softwareName() const; /// \brief separator native to the current OS static std::string separator(); + /// \brief return if is ultimate + bool isUltimate() const; static FacilityEngine facilityEngine; private: diff --git a/HelpDialog.cpp b/HelpDialog.cpp index 0e266e4..b52e402 100644 --- a/HelpDialog.cpp +++ b/HelpDialog.cpp @@ -4,6 +4,7 @@ \licence GPL3, see the file COPYING */ #include "HelpDialog.h" +#include "ProductKey.h" #include <QTreeWidgetItem> #include <QApplication> @@ -36,6 +37,9 @@ HelpDialog::HelpDialog() : #else setWindowTitle(tr("About Ultracopier")); #endif + #ifndef ULTRACOPIER_INTERNET_SUPPORT + ui->checkUpdate->hide(); + #endif } /// \brief Destruct the object @@ -64,11 +68,10 @@ void HelpDialog::reloadTextValue() { ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"start"); QString text=ui->label_ultracopier->text(); - #ifdef ULTRACOPIER_VERSION_ULTIMATE - text=text.replace(QStringLiteral("%1"),QStringLiteral("Ultimate %1").arg(ULTRACOPIER_VERSION)); - #else - text=text.replace(QStringLiteral("%1"),ULTRACOPIER_VERSION); - #endif + if(ProductKey::productKey->isUltimate()) + text=text.replace(QStringLiteral("%1"),QStringLiteral("Ultimate %1").arg(ULTRACOPIER_VERSION)); + else + text=text.replace(QStringLiteral("%1"),ULTRACOPIER_VERSION); #ifdef ULTRACOPIER_MODE_SUPERCOPIER text=text.replace(QStringLiteral("Ultracopier"),QStringLiteral("Supercopier"),Qt::CaseInsensitive); #endif @@ -112,15 +115,7 @@ std::string HelpDialog::getWebSite() std::string HelpDialog::getUpdateUrl() { - #if defined(ULTRACOPIER_VERSION_ULTIMATE) - return tr("http://ultracopier.first-world.info/shop.html").toStdString(); - #else - #ifdef ULTRACOPIER_MODE_SUPERCOPIER - return tr("http://ultracopier.first-world.info/").toStdString()+"supercopier.html"; - #else - return tr("http://ultracopier.first-world.info/download.html").toStdString(); - #endif - #endif + return tr("http://ultracopier.first-world.info/download.html").toStdString(); } #ifdef ULTRACOPIER_DEBUG @@ -143,3 +138,22 @@ void HelpDialog::on_pushButtonCrash_clicked() int *b=NULL; *b=3/a; } + +#ifdef ULTRACOPIER_INTERNET_SUPPORT +void HelpDialog::on_checkUpdate_clicked() +{ + ui->status->setText(tr("Update checking...")); + emit checkUpdate(); +} + +void HelpDialog::newUpdate(const std::string &version) const +{ + ui->status->setText(tr("Update: %1").arg(QString::fromStdString(version))); +} + +void HelpDialog::noNewUpdate() const +{ + if(!ui->status->text().isEmpty()) + ui->status->setText(tr("No update")); +} +#endif diff --git a/HelpDialog.h b/HelpDialog.h index 91e5dbc..cb47606 100644 --- a/HelpDialog.h +++ b/HelpDialog.h @@ -29,6 +29,11 @@ class HelpDialog : public QDialog { ~HelpDialog(); static std::string getWebSite(); static std::string getUpdateUrl(); + + #ifdef ULTRACOPIER_INTERNET_SUPPORT + void newUpdate(const std::string &version) const; + void noNewUpdate() const; + #endif protected: /// \brief To re-translate the ui void changeEvent(QEvent *e); @@ -43,6 +48,11 @@ class HelpDialog : public QDialog { #endif // ULTRACOPIER_DEBUG void on_pushButtonAboutQt_clicked(); void on_pushButtonCrash_clicked(); + void on_checkUpdate_clicked(); + #ifdef ULTRACOPIER_INTERNET_SUPPORT + signals: + void checkUpdate(); + #endif }; #endif // DIALOG_H diff --git a/HelpDialog.ui b/HelpDialog.ui index 5d42f18..d3f3076 100644 --- a/HelpDialog.ui +++ b/HelpDialog.ui @@ -86,6 +86,13 @@ This version is compiled as version: %1.</string> </property> </widget> </item> + <item> + <widget class="QLabel" name="label_2"> + <property name="text"> + <string>Author: BRULE Herman Jacques Roger (alpha_one_x86), company: <a href="http://www.confiared.com/">confiared</a></string> + </property> + </widget> + </item> </layout> </item> </layout> @@ -136,6 +143,16 @@ This version is compiled as version: %1.</string> </spacer> </item> <item> + <widget class="QLabel" name="status"/> + </item> + <item> + <widget class="QPushButton" name="checkUpdate"> + <property name="text"> + <string>Check update</string> + </property> + </widget> + </item> + <item> <widget class="QPushButton" name="pushButtonCrash"> <property name="text"> <string>Do a crash</string> diff --git a/InternetUpdater.cpp b/InternetUpdater.cpp index 9246e80..28b7215 100644 --- a/InternetUpdater.cpp +++ b/InternetUpdater.cpp @@ -2,6 +2,7 @@ #include "EventDispatcher.h" #include "OptionEngine.h" #include "cpp11addition.h" +#include "ProductKey.h" #ifdef ULTRACOPIER_INTERNET_SUPPORT @@ -19,6 +20,7 @@ InternetUpdater::InternetUpdater(QObject *parent) : firstUpdateTimer.setSingleShot(true); firstUpdateTimer.start(1000*60); reply=NULL; + qnam=new QNetworkAccessManager(); } InternetUpdater::~InternetUpdater() @@ -28,23 +30,34 @@ InternetUpdater::~InternetUpdater() delete reply; reply=NULL; } + delete qnam; +} + +void InternetUpdater::checkUpdate() +{ + downloadFileInternal(true); } void InternetUpdater::downloadFile() { - if(!stringtobool(OptionEngine::optionEngine->getOptionValue("Ultracopier","checkTheUpdate"))) - return; + downloadFileInternal(); +} + +void InternetUpdater::downloadFileInternal(const bool force) +{ + if(!force) + if(!stringtobool(OptionEngine::optionEngine->getOptionValue("Ultracopier","checkTheUpdate"))) + return; #ifdef ULTRACOPIER_MODE_SUPERCOPIER std::string name="Supercopier"; #else std::string name="Ultracopier"; #endif std::string ultracopierVersion; - #ifdef ULTRACOPIER_VERSION_ULTIMATE - ultracopierVersion=name+" Ultimate/"+ULTRACOPIER_VERSION; - #else - ultracopierVersion=name+"/"+ULTRACOPIER_VERSION; - #endif + if(ProductKey::productKey->isUltimate()) + ultracopierVersion=name+" Ultimate/"+ULTRACOPIER_VERSION; + else + ultracopierVersion=name+"/"+ULTRACOPIER_VERSION; #ifdef ULTRACOPIER_VERSION_PORTABLE #ifdef ULTRACOPIER_PLUGIN_ALL_IN_ONE ultracopierVersion+=" portable/all-in-one"; @@ -63,7 +76,7 @@ void InternetUpdater::downloadFile() QNetworkRequest networkRequest(QStringLiteral(ULTRACOPIER_UPDATER_URL)); networkRequest.setHeader(QNetworkRequest::UserAgentHeader,QString::fromStdString(ultracopierVersion)); networkRequest.setRawHeader("Connection", "Close"); - reply = qnam.get(networkRequest); + reply = qnam->get(networkRequest); connect(reply, &QNetworkReply::finished, this, &InternetUpdater::httpFinished); } @@ -113,18 +126,23 @@ void InternetUpdater::httpFinished() { reply->deleteLater(); reply=NULL; + emit noNewUpdate(); return; } if(PluginsManager::compareVersion(newVersion.toStdString(),"<=",ULTRACOPIER_VERSION)) { reply->deleteLater(); reply=NULL; + emit noNewUpdate(); return; } newUpdateTimer.stop(); emit newUpdate(newVersion.toStdString()); reply->deleteLater(); reply=NULL; + //regen to force close the connection + delete qnam; + qnam=new QNetworkAccessManager(); } #endif diff --git a/InternetUpdater.h b/InternetUpdater.h index d9fc2ce..7ed6abc 100644 --- a/InternetUpdater.h +++ b/InternetUpdater.h @@ -17,13 +17,17 @@ class InternetUpdater : public QObject public: explicit InternetUpdater(QObject *parent = 0); ~InternetUpdater(); + void checkUpdate(); signals: void newUpdate(const std::string &version) const; + void noNewUpdate() const; private: QTimer newUpdateTimer; QTimer firstUpdateTimer; - QNetworkAccessManager qnam; + QNetworkAccessManager *qnam;//destroy to close connection QNetworkReply *reply; + + void downloadFileInternal(const bool force=false); private slots: void downloadFile(); void httpFinished(); diff --git a/LanguagesManager.cpp b/LanguagesManager.cpp index a8849c4..136c590 100644 --- a/LanguagesManager.cpp +++ b/LanguagesManager.cpp @@ -26,25 +26,35 @@ LanguagesManager::LanguagesManager() index++; } //load the plugins - PluginsManager::pluginsManager->lockPluginListEdition(); - connect(this,&LanguagesManager::previouslyPluginAdded, this, &LanguagesManager::onePluginAdded,Qt::QueuedConnection); - connect(PluginsManager::pluginsManager,&PluginsManager::onePluginAdded,this, &LanguagesManager::onePluginAdded,Qt::QueuedConnection); - #ifndef ULTRACOPIER_PLUGIN_ALL_IN_ONE - connect(PluginsManager::pluginsManager,&PluginsManager::onePluginWillBeRemoved, this, &LanguagesManager::onePluginWillBeRemoved,Qt::DirectConnection); - #endif - connect(PluginsManager::pluginsManager,&PluginsManager::pluginListingIsfinish, this, &LanguagesManager::allPluginIsLoaded,Qt::QueuedConnection); - std::vector<PluginsAvailable> list=PluginsManager::pluginsManager->getPluginsByCategory(PluginType_Languages); - foreach(PluginsAvailable currentPlugin,list) - emit previouslyPluginAdded(currentPlugin); - PluginsManager::pluginsManager->unlockPluginListEdition(); + if(PluginsManager::pluginsManager!=NULL) + { + PluginsManager::pluginsManager->lockPluginListEdition(); + connect(this,&LanguagesManager::previouslyPluginAdded, this, &LanguagesManager::onePluginAdded,Qt::QueuedConnection); + connect(PluginsManager::pluginsManager,&PluginsManager::onePluginAdded,this, &LanguagesManager::onePluginAdded,Qt::QueuedConnection); + #ifndef ULTRACOPIER_PLUGIN_ALL_IN_ONE + connect(PluginsManager::pluginsManager,&PluginsManager::onePluginWillBeRemoved, this, &LanguagesManager::onePluginWillBeRemoved,Qt::DirectConnection); + #endif + connect(PluginsManager::pluginsManager,&PluginsManager::pluginListingIsfinish, this, &LanguagesManager::allPluginIsLoaded,Qt::QueuedConnection); + std::vector<PluginsAvailable> list=PluginsManager::pluginsManager->getPluginsByCategory(PluginType_Languages); + foreach(PluginsAvailable currentPlugin,list) + emit previouslyPluginAdded(currentPlugin); + PluginsManager::pluginsManager->unlockPluginListEdition(); + } + else + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Critical,"plugin manager null"); //load the GUI option - std::vector<std::pair<std::string, std::string> > KeysList; - KeysList.push_back(std::pair<std::string, std::string>("Language","en")); - KeysList.push_back(std::pair<std::string, std::string>("Language_force","false")); - OptionEngine::optionEngine->addOptionGroup("Language",KeysList); -// connect(this, &LanguagesManager::newLanguageLoaded, plugins,&PluginsManager::refreshPluginList); -// connect(this, &LanguagesManager::newLanguageLoaded, this,&LanguagesManager::retranslateTheUI); - connect(OptionEngine::optionEngine,&OptionEngine::newOptionValue, this, &LanguagesManager::newOptionValue,Qt::QueuedConnection); + if(OptionEngine::optionEngine!=NULL) + { + std::vector<std::pair<std::string, std::string> > KeysList; + KeysList.push_back(std::pair<std::string, std::string>("Language","en")); + KeysList.push_back(std::pair<std::string, std::string>("Language_force","false")); + OptionEngine::optionEngine->addOptionGroup("Language",KeysList); + // connect(this, &LanguagesManager::newLanguageLoaded, plugins,&PluginsManager::refreshPluginList); + // connect(this, &LanguagesManager::newLanguageLoaded, this,&LanguagesManager::retranslateTheUI); + connect(OptionEngine::optionEngine,&OptionEngine::newOptionValue, this, &LanguagesManager::newOptionValue,Qt::QueuedConnection); + } + else + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Critical,"option engine null"); connect(this, &LanguagesManager::newLanguageLoaded, PluginsManager::pluginsManager,&PluginsManager::newLanguageLoaded,Qt::QueuedConnection); } diff --git a/LocalPluginOptions.cpp b/LocalPluginOptions.cpp index f981e0b..0834d9d 100644 --- a/LocalPluginOptions.cpp +++ b/LocalPluginOptions.cpp @@ -10,7 +10,7 @@ LocalPluginOptions::LocalPluginOptions(const std::string &group) ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"start(\""+group+"\",[...])"); groupOptionAdded=false; this->group=group; - connect(OptionEngine::optionEngine,&OptionEngine::resetOptions,this,&OptionInterface::resetOptions); + connect(OptionEngine::optionEngine,&OptionEngine::resetOptions,this,&OptionInterface::resetOptions);//unsure } LocalPluginOptions::~LocalPluginOptions() @@ -50,8 +50,8 @@ void LocalPluginOptions::setOptionValue(const std::string &variableName,const st OptionEngine::optionEngine->setOptionValue(group,variableName,value); } -/*-> disabled because the value will not externaly changed, then useless notification -void LocalPluginOptions::newOptionValue(QString group,QString variable,QVariant value) +// can be externally changed via reset +/*void LocalPluginOptions::newOptionValue(const std::string &group, const std::string &variable, const std::string &value) { if(group==this->group) emit newOptionValue(variable,value); diff --git a/LocalPluginOptions.h b/LocalPluginOptions.h index 9f30f2f..853181f 100644 --- a/LocalPluginOptions.h +++ b/LocalPluginOptions.h @@ -31,6 +31,7 @@ public: std::string getOptionValue(const std::string &variableName) const; /// \brief To set option value void setOptionValue(const std::string &variableName,const std::string &value); + //void newOptionValue(const std::string&,const std::string&,const std::string&); protected: //for the options std::string group; diff --git a/OptionDialog.cpp b/OptionDialog.cpp index 4c64875..4727501 100644 --- a/OptionDialog.cpp +++ b/OptionDialog.cpp @@ -405,6 +405,7 @@ void OptionDialog::loadOption() newOptionValue("Ultracopier", "displayOSSpecific", OptionEngine::optionEngine->getOptionValue("Ultracopier","displayOSSpecific")); newOptionValue("Ultracopier", "checkTheUpdate", OptionEngine::optionEngine->getOptionValue("Ultracopier","checkTheUpdate")); newOptionValue("Ultracopier", "remainingTimeAlgorithm", OptionEngine::optionEngine->getOptionValue("Ultracopier","remainingTimeAlgorithm")); + newOptionValue("Ultracopier", "portable", OptionEngine::optionEngine->getOptionValue("Ultracopier","portable")); newOptionValue("Language", "Language", OptionEngine::optionEngine->getOptionValue("Language","Language")); newOptionValue("Language", "Language_force", OptionEngine::optionEngine->getOptionValue("Language","Language_force")); #ifndef ULTRACOPIER_VERSION_PORTABLE @@ -595,6 +596,11 @@ void OptionDialog::newOptionValue(const std::string &group,const std::string &na if(ok) ui->remainingTimeAlgorithm->setCurrentIndex(static_cast<int>(valueInt)); } + else if(name=="portable") + { + QString settingsFilePath=QString::fromStdString(ResourcesManager::resourcesManager->getWritablePath()); + ui->portable->setChecked(QFile::exists(settingsFilePath+"/Ultracopier.conf")); + } } } @@ -1013,3 +1019,20 @@ void OptionDialog::on_remainingTimeAlgorithm_currentIndexChanged(int index) OptionEngine::optionEngine->setOptionValue("Ultracopier","remainingTimeAlgorithm",std::to_string(index)); } } + +void OptionDialog::on_portable_toggled(bool) +{ + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"start"); + const bool portable=ui->portable->isChecked(); + OptionEngine::optionEngine->setOptionValue("Ultracopier","portable",booltostring(portable)); + + QString settingsFilePath=QString::fromStdString(ResourcesManager::resourcesManager->getWritablePath()); + if(portable) + { + QFile file(settingsFilePath+"/Ultracopier.conf"); + file.open(QIODevice::ReadWrite); + file.close(); + } + else + QFile::remove(settingsFilePath+"/Ultracopier.conf"); +} diff --git a/OptionDialog.h b/OptionDialog.h index c8e9db3..d1de3db 100644 --- a/OptionDialog.h +++ b/OptionDialog.h @@ -81,7 +81,7 @@ private slots: void on_confirmToGroupWindows_clicked(); void oSSpecificClosed(); void on_remainingTimeAlgorithm_currentIndexChanged(int index); - + void on_portable_toggled(bool); private: bool quit; Ui::OptionDialog *ui; diff --git a/OptionDialog.ui b/OptionDialog.ui index 54d9591..2a154ec 100644 --- a/OptionDialog.ui +++ b/OptionDialog.ui @@ -276,6 +276,20 @@ </item> </widget> </item> + <item row="9" column="1"> + <widget class="QCheckBox" name="portable"> + <property name="text"> + <string/> + </property> + </widget> + </item> + <item row="9" column="0"> + <widget class="QLabel" name="label_12"> + <property name="text"> + <string>Portable (need restart)</string> + </property> + </widget> + </item> </layout> </item> <item> diff --git a/OptionEngine.cpp b/OptionEngine.cpp index ad2cf7c..cd3adf1 100644 --- a/OptionEngine.cpp +++ b/OptionEngine.cpp @@ -18,15 +18,16 @@ OptionEngine::OptionEngine() { //locate the settings - #ifdef ULTRACOPIER_VERSION_PORTABLE - QString settingsFilePath=QString::fromStdString(ResourcesManager::resourcesManager->getWritablePath()); + QString settingsFilePath=QString::fromStdString(ResourcesManager::resourcesManager->getWritablePath()); + if(QFile::exists(settingsFilePath+"/Ultracopier.conf")) + { if(settingsFilePath!="") settings = new QSettings(settingsFilePath+QStringLiteral("Ultracopier.conf"),QSettings::IniFormat); else settings = NULL; - #else // ULTRACOPIER_VERSION_PORTABLE + } + else settings = new QSettings(QStringLiteral("Ultracopier"),QStringLiteral("Ultracopier")); - #endif // ULTRACOPIER_VERSION_PORTABLE if(settings!=NULL) { //do some write test @@ -69,6 +70,7 @@ OptionEngine::OptionEngine() } else currentBackend=File; + connect(this,&OptionEngine::resetOptions,this,&OptionEngine::internal_resetToDefaultValue); } /// \brief Destroy the option @@ -95,25 +97,24 @@ bool OptionEngine::addOptionGroup(const std::string &groupName,const std::vector while(index<KeysList.size()) { OptionEngineGroupKey theCurrentKey; - theCurrentKey.defaultValue=KeysList.at(index).second; + const std::pair<std::string, std::string> &key=KeysList.at(index); + theCurrentKey.defaultValue=key.second; //if memory backend, load the default value into the current value if(currentBackend==Memory) theCurrentKey.currentValue=theCurrentKey.defaultValue; else { - if(settings->contains(QString::fromStdString(KeysList.at(index).first)))//if file backend, load the default value from the file + if(settings->contains(QString::fromStdString(key.first)))//if file backend, load the default value from the file { - theCurrentKey.currentValue=settings->value(QString::fromStdString(KeysList.at(index).first)).toString().toStdString(); + theCurrentKey.currentValue=settings->value(QString::fromStdString(key.first)).toString().toStdString(); #ifdef ULTRACOPIER_DEBUG if(theCurrentKey.currentValue!=theCurrentKey.defaultValue) { - #ifdef ULTRACOPIER_VERSION_ULTIMATE - if(groupName=="Ultracopier" && KeysList.at(index).first=="key") + if(groupName=="Ultracopier" && key.first=="key") { } else - #endif - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Information,"The current key: "+groupName+", group: "+KeysList.at(index).first+", have value: "+theCurrentKey.currentValue); + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Information,"The current key: "+groupName+", group: "+key.first+", have value: "+theCurrentKey.currentValue); } #endif } @@ -121,7 +122,7 @@ bool OptionEngine::addOptionGroup(const std::string &groupName,const std::vector { theCurrentKey.currentValue=theCurrentKey.defaultValue; //to switch default value if is unchanged - //settings->setValue(KeysList.at(index).first,theCurrentKey.defaultValue); + //settings->setValue(key.first,theCurrentKey.defaultValue); } if(settings->status()!=QSettings::NoError) { @@ -132,7 +133,7 @@ bool OptionEngine::addOptionGroup(const std::string &groupName,const std::vector currentBackend=Memory; } } - GroupKeysList[groupName][KeysList.at(index).first]=theCurrentKey; + GroupKeysList[groupName][key.first]=theCurrentKey; index++; } //if the backend is file, leave into the group @@ -230,6 +231,21 @@ void OptionEngine::internal_resetToDefaultValue() if(o.currentValue!=o.defaultValue) { o.currentValue=o.defaultValue; + + if(currentBackend==File) + { + settings->beginGroup(QString::fromStdString(firstKey)); + settings->remove(QString::fromStdString(secondKey)); + settings->endGroup(); + if(settings->status()!=QSettings::NoError) + { + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"Have writing error, switch to memory only options"); + #ifdef ULTRACOPIER_VERSION_PORTABLE + ResourcesManager::resourcesManager->disableWritablePath(); + #endif // ULTRACOPIER_VERSION_PORTABLE + currentBackend=Memory; + } + } emit newOptionValue(firstKey,secondKey,o.currentValue); } } diff --git a/ProductKey.cpp b/ProductKey.cpp new file mode 100644 index 0000000..eeb533c --- /dev/null +++ b/ProductKey.cpp @@ -0,0 +1,67 @@ +#include "ProductKey.h" +#include "ui_ProductKey.h" +#include "DebugEngine.h" +#include "OptionEngine.h" +#include "SystrayIcon.h" +#include <QMessageBox> +#include <QCryptographicHash> + +ProductKey::ProductKey(QWidget *parent) : + QDialog(parent), + ui(new Ui::ProductKey) +{ + ui->setupUi(this); + parseKey(); +} + +ProductKey::~ProductKey() +{ + delete ui; +} + +bool ProductKey::parseKey(QString orgkey) +{ + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"ultimate key"); + QString key=orgkey; + if(orgkey.isEmpty()) + key=QString::fromStdString(OptionEngine::optionEngine->getOptionValue("Ultracopier","key")); + if(!key.isEmpty()) + { + QCryptographicHash hash(QCryptographicHash::Sha224); + hash.addData(QStringLiteral("U2NgvbKVrVwlaXnx").toUtf8()); + hash.addData(key.toUtf8()); + const QByteArray &result=hash.result(); + if(!result.isEmpty() && result.at(0)==0x00 && result.at(1)==0x00) + { + if(!orgkey.isEmpty()) + OptionEngine::optionEngine->setOptionValue("Ultracopier","key",key.toStdString()); + ultimate=true; + } + else + ultimate=false; + } + else + ultimate=false; + return ultimate; +} + +bool ProductKey::isUltimate() const +{ + return ultimate; +} + +void ProductKey::on_buttonBox_accepted() +{ + if(!ProductKey::parseKey(ui->productkey->text())) + QMessageBox::critical(this,tr("Error"),"<br />"+tr("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>")); + else + { + changeToUltimate(); + hide(); + } +} + +void ProductKey::on_buttonBox_rejected() +{ + hide(); +} diff --git a/ProductKey.h b/ProductKey.h new file mode 100644 index 0000000..64fd536 --- /dev/null +++ b/ProductKey.h @@ -0,0 +1,30 @@ +#ifndef PRODUCTKEY_H +#define PRODUCTKEY_H + +#include <QDialog> + +namespace Ui { +class ProductKey; +} + +class ProductKey : public QDialog +{ + Q_OBJECT + +public: + explicit ProductKey(QWidget *parent = 0); + ~ProductKey(); + bool isUltimate() const; + static ProductKey *productKey; + bool parseKey(QString orgkey=QString()); +private slots: + void on_buttonBox_accepted(); + void on_buttonBox_rejected(); +private: + Ui::ProductKey *ui; + bool ultimate; +signals: + void changeToUltimate(); +}; + +#endif // PRODUCTKEY_H diff --git a/ProductKey.ui b/ProductKey.ui new file mode 100644 index 0000000..bd881ec --- /dev/null +++ b/ProductKey.ui @@ -0,0 +1,41 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> + <class>ProductKey</class> + <widget class="QDialog" name="ProductKey"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>186</width> + <height>89</height> + </rect> + </property> + <property name="windowTitle"> + <string>Product key</string> + </property> + <property name="windowIcon"> + <iconset resource="plugins/Themes/Oxygen/interfaceResources_unix.qrc"> + <normaloff>:/Themes/Oxygen/resources/SystemTrayIcon/systray_Caught_Unix.png</normaloff>:/Themes/Oxygen/resources/SystemTrayIcon/systray_Caught_Unix.png</iconset> + </property> + <layout class="QVBoxLayout" name="verticalLayout"> + <item> + <widget class="QLineEdit" name="productkey"> + <property name="placeholderText"> + <string>Product key</string> + </property> + </widget> + </item> + <item> + <widget class="QDialogButtonBox" name="buttonBox"> + <property name="standardButtons"> + <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set> + </property> + </widget> + </item> + </layout> + </widget> + <resources> + <include location="plugins/Themes/Oxygen/interfaceResources_unix.qrc"/> + </resources> + <connections/> +</ui> @@ -1,46 +0,0 @@ -=======================================================
-Description ===========================================
-=======================================================
-
-Ultracopier (https://ultracopier.first-world.info/) is free and open
-source software licensed under GPLv3 that acts as a replacement for
-files copy dialogs.
-
-Main features include:
- - pause/resume transfers
- - dynamic speed limitation
- - on-error resume,
- - error/collision management
-
-=======================================================
-Changelog =============================================
-=======================================================
-You can have the changelog at this url (or search on the forum):
-https://forum-ultracopier.first-world.info/the-announces/changelog-for-ultracopier-1-0-x-x-supercopier-4-0-x-x-t406.html
-
-=======================================================
-License ===============================================
-=======================================================
-Ultracopier is licensed under the GNU General Public License version 3.
-The text of the GNU General Public License can be viewed at https://www.gnu.org/licenses/gpl.html
-See COPYING file.
-
-=======================================================
-Core Developers =======================================
-=======================================================
-BRULE Herman or alpha_one_x86 <ultracopier@first-world.info>
-- Original author, API, kio_slaves, source
-See the Development team section of https://ultracopier.first-world.info/contact.html for an updated list of Ultracopier team!
-
-=======================================================
-Building and documentation ============================
-=======================================================
-See the wiki for the general documentation and how to for building: https://ultracopier-wiki.first-world.info/
-For the code documentation: https://doc-ultracopier.first-world.info/ (generated by doxygen)
-The source proposed on the site is reconstritued source from: https://github.com/alphaonex86/Ultracopier to facilitate contribute effort.
-Prefer ultracopier.pro to have easy and NO modular software. This is more oriented to GNU/Linux and macOS.
-
-======================================================
-Warranty =============================================
-======================================================
-Ultracopier in all version is shipped without warranty (0% of warranty). Only the stable version have warranty of be tested in lot of case. But in any case have warranty about data security, or other way of warranty.
diff --git a/README.md b/README.md new file mode 100644 index 0000000..18d0a4e --- /dev/null +++ b/README.md @@ -0,0 +1,41 @@ +# About + +[Ultracopier](https://ultracopier.first-world.info/) is free and open +source software licensed under GPLv3 that acts as a replacement for +files copy dialogs. + +Main features include: +- task queue +- pause / resume +- resume unfinished jobs +- dynamic speed limitation +- collision management +- plugin support + + +# Building + +Building an all-in-one version is as easy as compiling the main Qt project: + + qmake ultracopier.pro + + +# Translations + +Translations are provided via [Qt Linguist](http://doc.qt.io/qt-5/qtlinguist-index.html). + +1. Run `lupdate ultracopier.pro` to update the translation files +2. Put your translation in `(plugins|resources)/Languages/XX/translation.ts` +3. Run `lrelease ultracopier.pro` to compile the files +4. Replace the `.qm` files in your Ultracopier release + + +# Plugins + +Customizations in form of [Plugins](plugins/README.md) are also possible. + + +# Contributing +This project is hosted on [Github](https://github.com/alphaonex86/Ultracopier). +Add issues and merge requests there! + diff --git a/SystrayIcon.cpp b/SystrayIcon.cpp index ab3c3e0..eb09f3b 100644 --- a/SystrayIcon.cpp +++ b/SystrayIcon.cpp @@ -12,6 +12,7 @@ #include "ThemesManager.h"
#include "LanguagesManager.h"
#include "HelpDialog.h"
+#include "ProductKey.h"
#ifdef Q_OS_MAC
//extern void qt_mac_set_dock_menu(QMenu *menu);
@@ -33,6 +34,7 @@ SystrayIcon::SystrayIcon(QObject * parent) : #endif
actionMenuQuit = new QAction(this);
actionOptions = new QAction(this);
+ actionProductKey = new QAction(this);
//actionTransfer = new QAction(this);
#if ! defined(Q_OS_LINUX) || (QT_VERSION < QT_VERSION_CHECK(5, 6, 0))
copyMenu = NULL;
@@ -61,6 +63,7 @@ SystrayIcon::SystrayIcon(QObject * parent) : connect(actionMenuQuit, &QAction::triggered, this, &SystrayIcon::quit);
connect(actionMenuAbout, &QAction::triggered, this, &SystrayIcon::showHelp);
connect(actionOptions, &QAction::triggered, this, &SystrayIcon::showOptions);
+ connect(actionProductKey, &QAction::triggered, this, &SystrayIcon::showProductKey);
connect(this, &SystrayIcon::activated, this, &SystrayIcon::CatchAction);
#ifdef ULTRACOPIER_INTERNET_SUPPORT
connect(this, &QSystemTrayIcon::messageClicked, this, &SystrayIcon::messageClicked);
@@ -77,6 +80,8 @@ SystrayIcon::SystrayIcon(QObject * parent) : #ifdef ULTRACOPIER_DEBUG
systrayMenu->addAction(actionSaveBugReport);
#endif
+ if(!ProductKey::productKey->isUltimate())
+ systrayMenu->addAction(actionProductKey);
systrayMenu->addAction(actionMenuQuit);
#ifndef Q_OS_MAC
systrayMenu->insertSeparator(actionOptions);
@@ -111,6 +116,7 @@ SystrayIcon::~SystrayIcon() #endif
delete actionMenuAbout;
delete actionOptions;
+ delete actionProductKey;
delete systrayMenu;
#if ! defined(Q_OS_LINUX) || (QT_VERSION < QT_VERSION_CHECK(5, 6, 0))
if(copyMenu!=NULL)
@@ -172,7 +178,8 @@ void SystrayIcon::showSystrayMessage(const std::string& text) #ifdef ULTRACOPIER_INTERNET_SUPPORT
void SystrayIcon::messageClicked()
{
- QDesktopServices::openUrl(QString::fromStdString(HelpDialog::getUpdateUrl()));
+ if(!QDesktopServices::openUrl(QString::fromStdString(HelpDialog::getUpdateUrl())))
+ ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Critical,"start, haveListenerInfo "+std::to_string((int)haveListenerInfo)+", havePluginLoaderInfo: "+std::to_string((int)havePluginLoaderInfo));
}
#endif
@@ -346,6 +353,8 @@ void SystrayIcon::updateCurrentTheme() IconOptions=QIcon("");
actionOptions->setIcon(IconOptions);
+ actionProductKey->setIcon(IconInfo);
+
tempIcon=ThemesManager::themesManager->loadIcon("SystemTrayIcon/add.png");
if(!tempIcon.isNull())
IconAdd=QIcon(tempIcon);
@@ -438,6 +447,7 @@ void SystrayIcon::retranslateTheUI() #endif
actionMenuQuit ->setText(tr("&Quit"));
actionOptions ->setText(tr("&Options"));
+ actionProductKey ->setText(tr("&Product key"));
reloadEngineList();
updateSystrayIcon();
}
@@ -475,7 +485,7 @@ void SystrayIcon::newUpdate(const std::string &version) /*if(version==lastVersion)
return;*/
lastVersion=version;
- showSystrayMessage((tr("New version: %1").arg(QString::fromStdString(version))+"\n"+tr("Click here to go on download page")).toStdString());
+ showSystrayMessage((tr("New version: %1").arg(QString::fromStdString(version))+"\n"+tr("Go to the download page:")).toStdString()+"\n"+HelpDialog::getUpdateUrl());
}
#endif
@@ -557,3 +567,8 @@ void SystrayIcon::reloadEngineList() }
setContextMenu(systrayMenu);
}
+
+void SystrayIcon::changeToUltimate()
+{
+ systrayMenu->removeAction(actionProductKey);
+}
diff --git a/SystrayIcon.h b/SystrayIcon.h index 5db5b4f..e17da02 100644 --- a/SystrayIcon.h +++ b/SystrayIcon.h @@ -43,6 +43,7 @@ class SystrayIcon : public QSystemTrayIcon #ifdef ULTRACOPIER_INTERNET_SUPPORT
void newUpdate(const std::string &version);
#endif
+ void changeToUltimate();
private:
#ifdef ULTRACOPIER_INTERNET_SUPPORT
std::string lastVersion;
@@ -59,6 +60,7 @@ class SystrayIcon : public QSystemTrayIcon #endif
QAction* actionMenuAbout; ///< Pointer on the About action
QAction* actionOptions; ///< Pointer on the Options action
+ QAction* actionProductKey; ///< Pointer on the Options action
QIcon IconQuit; ///< Pointer on the icon for quit
#ifdef ULTRACOPIER_DEBUG
QIcon IconSaveBugReport;
@@ -132,6 +134,8 @@ class SystrayIcon : public QSystemTrayIcon void showHelp() const;
/// \brief Show the help option
void showOptions() const;
+ /// \brief Show the help option
+ void showProductKey() const;
/** \brief Add window copy or window move
\param mode Can be CopyMode::Copy or CopyMode::Move
\return The core object of the new window created */
@@ -14,16 +14,14 @@ #define ULTRACOPIER_DEBUG_MAX_ALL_SIZE 128 ///< \brief Max size (in MB) after the console/file output is dropped
#define ULTRACOPIER_DEBUG_MAX_IMPORTANT_SIZE 150 ///< \brief Max size (in MB) after the console/file important output is dropped
/// \brief the version
-#define ULTRACOPIER_VERSION "1.4.0.8"
+#define ULTRACOPIER_VERSION "1.6.1.3"
/// \brief the windows version
-#define ULTRACOPIER_WINDOWS_VERSION 1,4,0,8
+#define ULTRACOPIER_WINDOWS_VERSION 1,6,1,3
// define if the version is portable or not
////#define ULTRACOPIER_VERSION_PORTABLE
////#define ULTRACOPIER_VERSION_PORTABLEAPPS
// define if the version is ultimate, need change only the name in the code
-//#define ULTRACOPIER_VERSION_ULTIMATE
//#define ULTRACOPIER_PLUGIN_ALL_IN_ONE
-//#define ULTRACOPIER_ILLEGAL
//#define ULTRACOPIER_MODE_SUPERCOPIER
/// \brief define time to update the speed detection update ont the interface (in ms)
#define ULTRACOPIER_TIME_INTERFACE_UPDATE 500
diff --git a/cpp11addition.cpp b/cpp11addition.cpp index 7da2205..41f3cc1 100644 --- a/cpp11addition.cpp +++ b/cpp11addition.cpp @@ -212,7 +212,7 @@ std::string binarytoHexa(const std::vector<char> &data, bool *ok) return output; } -std::string binarytoHexa(const unsigned char * const data, const uint32_t &size, bool *ok) +std::string binarytoHexa(const void * const data, const uint32_t &size, bool *ok) { return binarytoHexa(reinterpret_cast<const char * const>(data),size,ok); } diff --git a/cpp11addition.h b/cpp11addition.h index db78b22..022f175 100644 --- a/cpp11addition.h +++ b/cpp11addition.h @@ -57,7 +57,7 @@ std::string stringlisttostring(const std::vector<std::string> &stringlist); std::string binarytoHexa(const std::vector<char> &data,bool *ok=NULL); std::string binarytoHexa(const char * const data,const uint32_t &size,bool *ok=NULL); -std::string binarytoHexa(const unsigned char * const data,const uint32_t &size,bool *ok=NULL); +std::string binarytoHexa(const void * const data, const uint32_t &size, bool *ok=NULL); uint8_t hexToDecUnit(const std::string& data,bool *ok=NULL); std::vector<char> hexatoBinary(const std::string &data,bool *ok=NULL); void binaryAppend(std::vector<char> &data,const std::vector<char> &add); diff --git a/interface/FacilityInterface.h b/interface/FacilityInterface.h index f9b000d..b64733b 100644 --- a/interface/FacilityInterface.h +++ b/interface/FacilityInterface.h @@ -39,6 +39,8 @@ class FacilityInterface : public QObject virtual std::string ultimateUrl() const = 0; /// \brief Return the software name virtual std::string softwareName() const = 0; + /// \brief return if is ultimate + virtual bool isUltimate() const = 0; }; #endif // FACILITY_INTERFACE_H @@ -14,6 +14,7 @@ #include "ResourcesManager.h"
#include "OptionEngine.h"
#include "PluginsManager.h"
+#include "ProductKey.h"
#ifndef ULTRACOPIER_PLUGIN_ALL_IN_ONE_DIRECT
#ifdef ULTRACOPIER_PLUGIN_ALL_IN_ONE
@@ -38,6 +39,7 @@ OptionEngine *OptionEngine::optionEngine=NULL; PluginsManager *PluginsManager::pluginsManager=NULL;
LanguagesManager *LanguagesManager::languagesManager=NULL;
ThemesManager *ThemesManager::themesManager=NULL;
+ProductKey *ProductKey::productKey=NULL;
void registerTheOptions()
{
@@ -49,14 +51,13 @@ void registerTheOptions() //add the options hidden, will not show in options pannel
KeysList.clear();
KeysList.push_back(std::pair<std::string, std::string>("Last_version_used","na"));
- #ifdef ULTRACOPIER_VERSION_ULTIMATE
KeysList.push_back(std::pair<std::string, std::string>("key",""));
- #endif
KeysList.push_back(std::pair<std::string, std::string>("ActionOnManualOpen","1"));
KeysList.push_back(std::pair<std::string, std::string>("GroupWindowWhen","0"));
KeysList.push_back(std::pair<std::string, std::string>("displayOSSpecific","true"));
KeysList.push_back(std::pair<std::string, std::string>("confirmToGroupWindows","true"));
KeysList.push_back(std::pair<std::string, std::string>("remainingTimeAlgorithm","1"));
+ KeysList.push_back(std::pair<std::string, std::string>("portable","false"));
#ifdef ULTRACOPIER_INTERNET_SUPPORT
#if defined(Q_OS_WIN32) || defined(Q_OS_MAC)
KeysList.push_back(std::pair<std::string, std::string>("checkTheUpdate","true"));
@@ -117,6 +118,7 @@ int main(int argc, char *argv[]) PluginsManager::pluginsManager=new PluginsManager();
LanguagesManager::languagesManager=new LanguagesManager();
ThemesManager::themesManager=new ThemesManager();
+ ProductKey::productKey=new ProductKey();
//the main code, event loop of Qt and event dispatcher of ultracopier
{
@@ -127,6 +129,8 @@ int main(int argc, char *argv[]) returnCode=ultracopierApplication.exec();
}
+ delete ProductKey::productKey;
+ ProductKey::productKey=NULL;
delete ThemesManager::themesManager;
ThemesManager::themesManager=NULL;
delete LanguagesManager::languagesManager;
diff --git a/other-pro/ultracopier-core.pro b/other-pro/ultracopier-core.pro index 1de66ad..d1da53a 100644 --- a/other-pro/ultracopier-core.pro +++ b/other-pro/ultracopier-core.pro @@ -35,7 +35,8 @@ macx { FORMS += $$PWD/../HelpDialog.ui \ $$PWD/../PluginInformation.ui \ $$PWD/../OptionDialog.ui \ - $$PWD/../OSSpecific.ui + $$PWD/../OSSpecific.ui \ + $$PWD/../ProductKey.ui RESOURCES += \ $$PWD/../resources/ultracopier-resources.qrc \ $$PWD/../resources/ultracopier-resources_unix.qrc \ @@ -89,7 +90,8 @@ HEADERS += $$PWD/../ResourcesManager.h \ $$PWD/../StructEnumDefinition_UltracopierSpecific.h \ $$PWD/../OSSpecific.h \ $$PWD/../cpp11addition.h \ - $$PWD/../InternetUpdater.h + $$PWD/../InternetUpdater.h \ + $$PWD/../ProductKey.h SOURCES += $$PWD/../ThemesManager.cpp \ $$PWD/../ResourcesManager.cpp \ $$PWD/../main.cpp \ @@ -124,7 +126,8 @@ SOURCES += $$PWD/../ThemesManager.cpp \ $$PWD/../cpp11addition.cpp \ $$PWD/../DebugModel.cpp \ $$PWD/../InternetUpdater.cpp \ - $$PWD/../cpp11additionstringtointcpp.cpp + $$PWD/../cpp11additionstringtointcpp.cpp \ + $$PWD/../ProductKey.cpp INCLUDEPATH += \ $$PWD/../lib/qt-tar-xz/ diff --git a/plugins-unmaintained/Listener/dbus/informations.xml b/plugins-unmaintained/Listener/dbus/informations.xml index 497371b..7c35186 100644 --- a/plugins-unmaintained/Listener/dbus/informations.xml +++ b/plugins-unmaintained/Listener/dbus/informations.xml @@ -17,7 +17,7 @@ <description xml:lang="en"><![CDATA[Listener for catchcopy in dbus. Allow to receive copy list from plugin/explorer compatible with catchcopy.]]></description> <description xml:lang="fr"><![CDATA[Écouteur pour catchcopy en dbus. Permet de recevoir un liste de copie venant d'un plugin/explorateur avec catchcopy.]]></description> <!-- Version of this release of this plugin, need be like that's: A.B.C.D, where A, B, C and D is number --> - <version>1.4.0.8</version> + <version>1.6.1.3</version> <!-- This internal name should never change, because it is used to detect when a particular plugin is updated. It must comprise only lower case ASCII characters (a-z), numerical digits (0-9), "-", "." or "_", and it must be be unique within the category. And have size lower than 64 char. --> <name>dbus</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-unmaintained/PluginLoader/keybinding/informations.xml b/plugins-unmaintained/PluginLoader/keybinding/informations.xml index 3386aaa..6fad20d 100644 --- a/plugins-unmaintained/PluginLoader/keybinding/informations.xml +++ b/plugins-unmaintained/PluginLoader/keybinding/informations.xml @@ -17,7 +17,7 @@ <description xml:lang="en"><![CDATA[Plugin loader for catchcopy v0002. Allow to receive copy list from plugin/explorer compatible with catchcopy.]]></description> <description xml:lang="fr"><![CDATA[Chargeur de plugin pour catchcopy v0002. Permet de recevoir un liste de copie venant d'un plugin/explorateur avec catchcopy.]]></description> <!-- Version of this release of this plugin, need be like that's: A.B.C.D, where A, B, C and D is number --> - <version>1.4.0.8</version> + <version>1.6.1.3</version> <!-- This internal name should never change, because it is used to detect when a particular plugin is updated. It must comprise only lower case ASCII characters (a-z), numerical digits (0-9), "-", "." or "_", and it must be be unique within the category. And have size lower than 64 char. --> <name>keybinding</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-unmaintained/SessionLoader/KDE4/informations.xml b/plugins-unmaintained/SessionLoader/KDE4/informations.xml index 1bf295b..e56ca91 100644 --- a/plugins-unmaintained/SessionLoader/KDE4/informations.xml +++ b/plugins-unmaintained/SessionLoader/KDE4/informations.xml @@ -17,7 +17,7 @@ <description xml:lang="en"><![CDATA[Test plugin to show how create SessionLoader plugin]]></description> <description xml:lang="fr"><![CDATA[Plugin de test pour monter comment créer un plugin SessionLoader]]></description> <!-- Version of this release of this plugin, need be like that's: A.B.C.D, where A, B, C and D is number --> - <version>1.4.0.8</version> + <version>1.6.1.3</version> <!-- This internal name should never change, because it is used to detect when a particular plugin is updated. It must comprise only lower case ASCII characters (a-z), numerical digits (0-9), "-", "." or "_", and it must be be unique within the category. And have size lower than 64 char. --> <name>KDE4</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-unmaintained/Themes/Clean/informations.xml b/plugins-unmaintained/Themes/Clean/informations.xml index 680d99a..94cfe42 100644 --- a/plugins-unmaintained/Themes/Clean/informations.xml +++ b/plugins-unmaintained/Themes/Clean/informations.xml @@ -17,7 +17,7 @@ <description xml:lang="en"><![CDATA[Clean style for Ultracopier]]></description> <description xml:lang="fr"><![CDATA[Style Clean pour Ultracopier]]></description> <!-- Version of this release of this plugin, need be like that's: A.B.C.D, where A, B, C and D is number --> - <version>1.4.0.8</version> + <version>1.6.1.3</version> <!-- This internal name should never change, because it is used to detect when a particular plugin is updated. It must comprise only lower case ASCII characters (a-z), numerical digits (0-9), "-", "." or "_", and it must be be unique within the category. And have size lower than 64 char. --> <name>Clean</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-unmaintained/Themes/Teracopy/informations.xml b/plugins-unmaintained/Themes/Teracopy/informations.xml index 4447611..5dadd91 100644 --- a/plugins-unmaintained/Themes/Teracopy/informations.xml +++ b/plugins-unmaintained/Themes/Teracopy/informations.xml @@ -17,7 +17,7 @@ <description xml:lang="en"><![CDATA[Teracopy style for Ultracopier, reproduct with screenshot on internet]]></description> <description xml:lang="fr"><![CDATA[Style Teracopy pour Ultracopier, reproduit avec les screenshots vu sur internet]]></description> <!-- Version of this release of this plugin, need be like that's: A.B.C.D, where A, B, C and D is number --> - <version>1.4.0.8</version> + <version>1.6.1.3</version> <!-- This internal name should never change, because it is used to detect when a particular plugin is updated. It must comprise only lower case ASCII characters (a-z), numerical digits (0-9), "-", "." or "_", and it must be be unique within the category. And have size lower than 64 char. --> <name>Teracopy</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-unmaintained/Themes/Windows/informations.xml b/plugins-unmaintained/Themes/Windows/informations.xml index 988d01c..25c4cbb 100644 --- a/plugins-unmaintained/Themes/Windows/informations.xml +++ b/plugins-unmaintained/Themes/Windows/informations.xml @@ -17,7 +17,7 @@ <description xml:lang="en"><![CDATA[Windows dialog for Ultracopier, to have same copy dialog than windows vista/7/8]]></description> <description xml:lang="fr"><![CDATA[Dialogue de Windows pour Ultracopier, pour avoir une boite de dialogue pour la copie comme windows vista/7/8]]></description> <!-- Version of this release of this plugin, need be like that's: A.B.C.D, where A, B, C and D is number --> - <version>1.4.0.8</version> + <version>1.6.1.3</version> <!-- This internal name should never change, because it is used to detect when a particular plugin is updated. It must comprise only lower case ASCII characters (a-z), numerical digits (0-9), "-", "." or "_", and it must be be unique within the category. And have size lower than 64 char. --> <name>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/CopyEngine/README.md b/plugins/CopyEngine/README.md new file mode 100644 index 0000000..317a7e4 --- /dev/null +++ b/plugins/CopyEngine/README.md @@ -0,0 +1,3 @@ +# Copy Engine + +This plugin type execute the copy/move to do diff --git a/plugins/CopyEngine/Rsync/README.md b/plugins/CopyEngine/Rsync/README.md new file mode 100644 index 0000000..94452a4 --- /dev/null +++ b/plugins/CopyEngine/Rsync/README.md @@ -0,0 +1,6 @@ +# Copy Engine: Rsync + +This copy engine uses the `rsync` command. It is implemented by compile switches +in the same code as the default _Ultracopier_ copy engine. + +Not same code due to delete part, to prevent error from some user diff --git a/plugins/CopyEngine/Rsync/informations.xml b/plugins/CopyEngine/Rsync/informations.xml index 5f1f5ed..990809e 100644 --- a/plugins/CopyEngine/Rsync/informations.xml +++ b/plugins/CopyEngine/Rsync/informations.xml @@ -17,7 +17,7 @@ <description xml:lang="en"><![CDATA[Rsync copy engine, variant of the official copy engine to provide simple way to do backups]]></description> <description xml:lang="fr"><![CDATA[Moteur de copie rsync, variante du moteur de copie officiel pour fournir une maniére simple de faire des backups]]></description> <!-- Version of this release of this plugin, need be like that's: A.B.C.D, where A, B, C and D is number --> - <version>1.4.0.8</version> + <version>1.6.1.3</version> <!-- This internal name should never change, because it is used to detect when a particular plugin is updated. It must comprise only lower case ASCII characters (a-z), numerical digits (0-9), "-", "." or "_", and it must be be unique within the category. And have size lower than 64 char. --> <name>Rsync</name> <!-- Dependency checking. This is used to check when a plugin may not be compatible with an updated version of either Ultracopier or another plugin. This example only checks Ultracopier. --> diff --git a/plugins/CopyEngine/Ultracopier/CopyEngineFactory.cpp b/plugins/CopyEngine/Ultracopier/CopyEngineFactory.cpp index 6822481..ce86c94 100644 --- a/plugins/CopyEngine/Ultracopier/CopyEngineFactory.cpp +++ b/plugins/CopyEngine/Ultracopier/CopyEngineFactory.cpp @@ -182,10 +182,12 @@ void CopyEngineFactory::setResources(OptionInterface * options,const std::string size_t max_memory=getTotalSystemMemory()/1024; if(max_memory>0) { + if(max_memory>2147483648) + max_memory=2147483648; if(sequentialBuffer>(max_memory/10)) - sequentialBuffer=max_memory/10; + sequentialBuffer=max_memory/10; if(parallelBuffer>(max_memory/100)) - parallelBuffer=max_memory/100; + parallelBuffer=max_memory/100; } ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Information,QStringLiteral("detected memory: %1MB").arg(max_memory/1024).toStdString()); #endif @@ -223,62 +225,11 @@ void CopyEngineFactory::setResources(OptionInterface * options,const std::string KeysList.push_back(std::pair<std::string, std::string>("inodeThreads",std::to_string(1))); KeysList.push_back(std::pair<std::string, std::string>("copyListOrder","false")); options->addOptionGroup(KeysList); - #if ! defined (Q_CC_GNU) - ui->keepDate->setEnabled(false); - ui->keepDate->setToolTip(QStringLiteral("Not supported with this compiler")); - #endif - ui->doRightTransfer->setChecked(stringtobool(options->getOptionValue("doRightTransfer"))); - ui->keepDate->setChecked(stringtobool(options->getOptionValue("keepDate"))); - ui->blockSize->setValue(stringtouint32(options->getOptionValue("blockSize")));//keep before sequentialBuffer and parallelBuffer - ui->autoStart->setChecked(stringtobool(options->getOptionValue("autoStart"))); - #ifdef ULTRACOPIER_PLUGIN_RSYNC - ui->rsync->setChecked(stringtobool(options->getOptionValue("rsync"))); - #else - ui->label_rsync->setVisible(false); - ui->rsync->setVisible(false); - #endif - ui->comboBoxFolderError->setCurrentIndex(stringtouint32(options->getOptionValue("folderError"))); - ui->comboBoxFolderCollision->setCurrentIndex(stringtouint32(options->getOptionValue("folderCollision"))); - ui->comboBoxFileError->setCurrentIndex(stringtouint32(options->getOptionValue("fileError"))); - ui->comboBoxFileCollision->setCurrentIndex(stringtouint32(options->getOptionValue("fileCollision"))); - ui->transferAlgorithm->setCurrentIndex(stringtouint32(options->getOptionValue("transferAlgorithm"))); - ui->checkBoxDestinationFolderExists->setChecked(stringtobool(options->getOptionValue("checkDestinationFolder"))); - ui->parallelizeIfSmallerThan->setValue(stringtouint32(options->getOptionValue("parallelizeIfSmallerThan"))); - ui->sequentialBuffer->setValue(stringtouint32(options->getOptionValue("sequentialBuffer"))); - ui->parallelBuffer->setValue(stringtouint32(options->getOptionValue("parallelBuffer"))); - ui->sequentialBuffer->setSingleStep(ui->blockSize->value()); - ui->parallelBuffer->setSingleStep(ui->blockSize->value()); - ui->deletePartiallyTransferredFiles->setChecked(stringtobool(options->getOptionValue("deletePartiallyTransferredFiles"))); - ui->moveTheWholeFolder->setChecked(stringtobool(options->getOptionValue("moveTheWholeFolder"))); - ui->followTheStrictOrder->setChecked(stringtobool(options->getOptionValue("followTheStrictOrder"))); - ui->inodeThreads->setValue(stringtouint32(options->getOptionValue("inodeThreads"))); - ui->renameTheOriginalDestination->setChecked(stringtobool(options->getOptionValue("renameTheOriginalDestination"))); - ui->checkDiskSpace->setChecked(stringtobool(options->getOptionValue("checkDiskSpace"))); - ui->defaultDestinationFolder->setText(QString::fromStdString(options->getOptionValue("defaultDestinationFolder"))); - - ui->doChecksum->setChecked(stringtobool(options->getOptionValue("doChecksum"))); - ui->checksumIgnoreIfImpossible->setChecked(stringtobool(options->getOptionValue("checksumIgnoreIfImpossible"))); - ui->checksumOnlyOnError->setChecked(stringtobool(options->getOptionValue("checksumOnlyOnError"))); - - ui->osBuffer->setChecked(stringtobool(options->getOptionValue("osBuffer"))); - ui->osBufferLimited->setChecked(stringtobool(options->getOptionValue("osBufferLimited"))); - ui->osBufferLimit->setValue(stringtouint32(options->getOptionValue("osBufferLimit"))); - //ui->autoStart->setChecked(options->getOptionValue("autoStart").toBool());//moved from options(), wrong previous place - includeStrings=stringtostringlist(options->getOptionValue("includeStrings")); - includeOptions=stringtostringlist(options->getOptionValue("includeOptions")); - excludeStrings=stringtostringlist(options->getOptionValue("excludeStrings")); - excludeOptions=stringtostringlist(options->getOptionValue("excludeOptions")); - filters->setFilters(includeStrings,includeOptions,excludeStrings,excludeOptions); - firstRenamingRule=options->getOptionValue("firstRenamingRule"); - otherRenamingRule=options->getOptionValue("otherRenamingRule"); - renamingRules->setRenamingRules(firstRenamingRule,otherRenamingRule); - - ui->checksumOnlyOnError->setEnabled(ui->doChecksum->isChecked()); - ui->checksumIgnoreIfImpossible->setEnabled(ui->doChecksum->isChecked()); - ui->copyListOrder->setChecked(stringtobool(options->getOptionValue("copyListOrder"))); - updateBufferCheckbox(); optionsEngine=options; + resetOptions(); + + updateBufferCheckbox(); updatedBlockSize(); } @@ -315,6 +266,63 @@ bool CopyEngineFactory::canDoOnlyCopy() const void CopyEngineFactory::resetOptions() { + auto options=optionsEngine; + optionsEngine=NULL; + #if ! defined (Q_CC_GNU) + ui->keepDate->setEnabled(false); + ui->keepDate->setToolTip(QStringLiteral("Not supported with this compiler")); + #endif + ui->doRightTransfer->setChecked(stringtobool(options->getOptionValue("doRightTransfer"))); + ui->keepDate->setChecked(stringtobool(options->getOptionValue("keepDate"))); + ui->blockSize->setValue(stringtouint32(options->getOptionValue("blockSize")));//keep before sequentialBuffer and parallelBuffer + ui->autoStart->setChecked(stringtobool(options->getOptionValue("autoStart"))); + #ifdef ULTRACOPIER_PLUGIN_RSYNC + ui->rsync->setChecked(stringtobool(options->getOptionValue("rsync"))); + #else + ui->label_rsync->setVisible(false); + ui->rsync->setVisible(false); + #endif + ui->comboBoxFolderError->setCurrentIndex(stringtouint32(options->getOptionValue("folderError"))); + ui->comboBoxFolderCollision->setCurrentIndex(stringtouint32(options->getOptionValue("folderCollision"))); + ui->comboBoxFileError->setCurrentIndex(stringtouint32(options->getOptionValue("fileError"))); + ui->comboBoxFileCollision->setCurrentIndex(stringtouint32(options->getOptionValue("fileCollision"))); + ui->transferAlgorithm->setCurrentIndex(stringtouint32(options->getOptionValue("transferAlgorithm"))); + ui->checkBoxDestinationFolderExists->setChecked(stringtobool(options->getOptionValue("checkDestinationFolder"))); + ui->parallelizeIfSmallerThan->setValue(stringtouint32(options->getOptionValue("parallelizeIfSmallerThan"))); + ui->sequentialBuffer->setValue(stringtouint32(options->getOptionValue("sequentialBuffer"))); + ui->parallelBuffer->setValue(stringtouint32(options->getOptionValue("parallelBuffer"))); + ui->sequentialBuffer->setSingleStep(ui->blockSize->value()); + ui->parallelBuffer->setSingleStep(ui->blockSize->value()); + ui->deletePartiallyTransferredFiles->setChecked(stringtobool(options->getOptionValue("deletePartiallyTransferredFiles"))); + ui->moveTheWholeFolder->setChecked(stringtobool(options->getOptionValue("moveTheWholeFolder"))); + ui->followTheStrictOrder->setChecked(stringtobool(options->getOptionValue("followTheStrictOrder"))); + ui->inodeThreads->setValue(stringtouint32(options->getOptionValue("inodeThreads"))); + ui->renameTheOriginalDestination->setChecked(stringtobool(options->getOptionValue("renameTheOriginalDestination"))); + ui->checkDiskSpace->setChecked(stringtobool(options->getOptionValue("checkDiskSpace"))); + ui->defaultDestinationFolder->setText(QString::fromStdString(options->getOptionValue("defaultDestinationFolder"))); + + ui->doChecksum->setChecked(stringtobool(options->getOptionValue("doChecksum"))); + ui->checksumIgnoreIfImpossible->setChecked(stringtobool(options->getOptionValue("checksumIgnoreIfImpossible"))); + ui->checksumOnlyOnError->setChecked(stringtobool(options->getOptionValue("checksumOnlyOnError"))); + + ui->osBuffer->setChecked(stringtobool(options->getOptionValue("osBuffer"))); + ui->osBufferLimited->setChecked(stringtobool(options->getOptionValue("osBufferLimited"))); + ui->osBufferLimit->setValue(stringtouint32(options->getOptionValue("osBufferLimit"))); + //ui->autoStart->setChecked(options->getOptionValue("autoStart").toBool());//moved from options(), wrong previous place + includeStrings=stringtostringlist(options->getOptionValue("includeStrings")); + includeOptions=stringtostringlist(options->getOptionValue("includeOptions")); + excludeStrings=stringtostringlist(options->getOptionValue("excludeStrings")); + excludeOptions=stringtostringlist(options->getOptionValue("excludeOptions")); + filters->setFilters(includeStrings,includeOptions,excludeStrings,excludeOptions); + firstRenamingRule=options->getOptionValue("firstRenamingRule"); + otherRenamingRule=options->getOptionValue("otherRenamingRule"); + renamingRules->setRenamingRules(firstRenamingRule,otherRenamingRule); + + ui->checksumOnlyOnError->setEnabled(ui->doChecksum->isChecked()); + ui->checksumIgnoreIfImpossible->setEnabled(ui->doChecksum->isChecked()); + ui->copyListOrder->setChecked(stringtobool(options->getOptionValue("copyListOrder"))); + + optionsEngine=options; } QWidget * CopyEngineFactory::options() diff --git a/plugins/CopyEngine/Ultracopier/FileExistsDialog.cpp b/plugins/CopyEngine/Ultracopier/FileExistsDialog.cpp index 91df1f8..10b8543 100644 --- a/plugins/CopyEngine/Ultracopier/FileExistsDialog.cpp +++ b/plugins/CopyEngine/Ultracopier/FileExistsDialog.cpp @@ -134,30 +134,26 @@ void FileExistsDialog::on_SuggestNewName_clicked() if(num==1) { if(firstRenamingRule.empty()) - newFileName=tr("%1 - copy").arg(fileName); + newFileName=tr("%name% - copy%suffix%"); else - { newFileName=QString::fromStdString(firstRenamingRule); - newFileName.replace("%name%",fileName); - } } else { if(otherRenamingRule.empty()) - newFileName=tr("%1 - copy (%2)").arg(fileName).arg(num); + newFileName=tr("%name% - copy (%number%)%suffix%"); else - { newFileName=QString::fromStdString(otherRenamingRule); - newFileName.replace(QStringLiteral("%name%"),fileName); - newFileName.replace(QStringLiteral("%number%"),QString::number(num)); - } + newFileName.replace(QStringLiteral("%number%"),QString::number(num)); } - destination=absolutePath+CURRENTSEPARATOR+newFileName+suffix; + newFileName.replace(QStringLiteral("%name%"),fileName); + newFileName.replace(QStringLiteral("%suffix%"),suffix); + destination=absolutePath+CURRENTSEPARATOR+newFileName; destinationInfo.setFile(destination); num++; } while(destinationInfo.exists()); - ui->lineEditNewName->setText(newFileName+suffix); + ui->lineEditNewName->setText(newFileName); } void FileExistsDialog::on_Rename_clicked() diff --git a/plugins/CopyEngine/Ultracopier/FileIsSameDialog.cpp b/plugins/CopyEngine/Ultracopier/FileIsSameDialog.cpp index 3bee3ae..7683d1d 100644 --- a/plugins/CopyEngine/Ultracopier/FileIsSameDialog.cpp +++ b/plugins/CopyEngine/Ultracopier/FileIsSameDialog.cpp @@ -108,30 +108,26 @@ void FileIsSameDialog::on_SuggestNewName_clicked() if(num==1) { if(firstRenamingRule.empty()) - newFileName=tr("%1 - copy").arg(fileName); + newFileName=tr("%name% - copy"); else - { newFileName=QString::fromStdString(firstRenamingRule); - newFileName.replace(QStringLiteral("%name%"),fileName); - } } else { if(otherRenamingRule.empty()) - newFileName=tr("%1 - copy (%2)").arg(fileName).arg(num); + newFileName=tr("%name% - copy (%number%)"); else - { newFileName=QString::fromStdString(otherRenamingRule); - newFileName.replace(QStringLiteral("%name%"),fileName); - newFileName.replace(QStringLiteral("%number%"),QString::number(num)); - } + newFileName.replace(QStringLiteral("%number%"),QString::number(num)); } + newFileName.replace(QStringLiteral("%name%"),fileName); + newFileName.replace(QStringLiteral("%suffix%"),suffix); destination=absolutePath+CURRENTSEPARATOR+newFileName+suffix; destinationInfo.setFile(destination); num++; } while(destinationInfo.exists()); - ui->lineEditNewName->setText(newFileName+suffix); + ui->lineEditNewName->setText(newFileName); } void FileIsSameDialog::on_Rename_clicked() diff --git a/plugins/CopyEngine/Ultracopier/FolderExistsDialog.cpp b/plugins/CopyEngine/Ultracopier/FolderExistsDialog.cpp index d05a715..59466ed 100644 --- a/plugins/CopyEngine/Ultracopier/FolderExistsDialog.cpp +++ b/plugins/CopyEngine/Ultracopier/FolderExistsDialog.cpp @@ -119,30 +119,27 @@ void FolderExistsDialog::on_SuggestNewName_clicked() if(num==1) { if(firstRenamingRule.empty()) - newFileName=tr("%1 - copy").arg(fileName); + newFileName=tr("%name% - copy"); else { newFileName=QString::fromStdString(firstRenamingRule); - newFileName.replace(QStringLiteral("%name%"),fileName); } } else { if(otherRenamingRule.empty()) - newFileName=tr("%1 - copy (%2)").arg(fileName).arg(num); + newFileName=tr("%name% - copy (%number%)"); else - { newFileName=QString::fromStdString(otherRenamingRule); - newFileName.replace(QStringLiteral("%name%"),fileName); - newFileName.replace(QStringLiteral("%number%"),QString::number(num)); - } + newFileName.replace(QStringLiteral("%number%"),QString::number(num)); } + newFileName.replace(QStringLiteral("%name%"),fileName); destination=absolutePath+CURRENTSEPARATOR+newFileName+suffix; destinationInfo.setFile(destination); num++; } while(destinationInfo.exists()); - ui->lineEditNewName->setText(newFileName+suffix); + ui->lineEditNewName->setText(newFileName); } void FolderExistsDialog::on_Rename_clicked() diff --git a/plugins/CopyEngine/Ultracopier/Languages/ar/translation.ts b/plugins/CopyEngine/Ultracopier/Languages/ar/translation.ts index 4d395a0..e17b3f2 100644 --- a/plugins/CopyEngine/Ultracopier/Languages/ar/translation.ts +++ b/plugins/CopyEngine/Ultracopier/Languages/ar/translation.ts @@ -146,85 +146,85 @@ <context> <name>CopyEngineFactory</name> <message> - <location filename="../../CopyEngineFactory.cpp" line="419"/> - <location filename="../../CopyEngineFactory.cpp" line="422"/> <location filename="../../CopyEngineFactory.cpp" line="427"/> - <location filename="../../CopyEngineFactory.cpp" line="431"/> + <location filename="../../CopyEngineFactory.cpp" line="430"/> + <location filename="../../CopyEngineFactory.cpp" line="435"/> + <location filename="../../CopyEngineFactory.cpp" line="439"/> <source>Ask</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="420"/> - <location filename="../../CopyEngineFactory.cpp" line="424"/> <location filename="../../CopyEngineFactory.cpp" line="428"/> <location filename="../../CopyEngineFactory.cpp" line="432"/> + <location filename="../../CopyEngineFactory.cpp" line="436"/> + <location filename="../../CopyEngineFactory.cpp" line="440"/> <source>Skip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="423"/> + <location filename="../../CopyEngineFactory.cpp" line="431"/> <source>Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="425"/> - <location filename="../../CopyEngineFactory.cpp" line="437"/> + <location filename="../../CopyEngineFactory.cpp" line="433"/> + <location filename="../../CopyEngineFactory.cpp" line="445"/> <source>Rename</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="429"/> + <location filename="../../CopyEngineFactory.cpp" line="437"/> <source>Put at the end</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="433"/> + <location filename="../../CopyEngineFactory.cpp" line="441"/> <source>Overwrite</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="434"/> + <location filename="../../CopyEngineFactory.cpp" line="442"/> <source>Overwrite if different</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="435"/> + <location filename="../../CopyEngineFactory.cpp" line="443"/> <source>Overwrite if newer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="436"/> + <location filename="../../CopyEngineFactory.cpp" line="444"/> <source>Overwrite if older</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="439"/> + <location filename="../../CopyEngineFactory.cpp" line="447"/> <source>Automatic</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="440"/> + <location filename="../../CopyEngineFactory.cpp" line="448"/> <source>Sequential</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="441"/> + <location filename="../../CopyEngineFactory.cpp" line="449"/> <source>Parallel</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="492"/> - <location filename="../../CopyEngineFactory.cpp" line="531"/> + <location filename="../../CopyEngineFactory.cpp" line="500"/> + <location filename="../../CopyEngineFactory.cpp" line="539"/> <source>Options error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="492"/> + <location filename="../../CopyEngineFactory.cpp" line="500"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="531"/> + <location filename="../../CopyEngineFactory.cpp" line="539"/> <source>Options engine is not loaded, can't access to the filters</source> <translation type="unfinished"></translation> </message> @@ -274,21 +274,21 @@ <name>FileExistsDialog</name> <message> <location filename="../../FileExistsDialog.cpp" line="137"/> - <source>%1 - copy</source> + <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="147"/> - <source>%1 - copy (%2)</source> + <location filename="../../FileExistsDialog.cpp" line="144"/> + <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="232"/> + <location filename="../../FileExistsDialog.cpp" line="228"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="232"/> + <location filename="../../FileExistsDialog.cpp" line="228"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -297,21 +297,21 @@ <name>FileIsSameDialog</name> <message> <location filename="../../FileIsSameDialog.cpp" line="111"/> - <source>%1 - copy</source> + <source>%name% - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="121"/> - <source>%1 - copy (%2)</source> + <location filename="../../FileIsSameDialog.cpp" line="118"/> + <source>%name% - copy (%number%)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="188"/> + <location filename="../../FileIsSameDialog.cpp" line="184"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="188"/> + <location filename="../../FileIsSameDialog.cpp" line="184"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -464,21 +464,21 @@ </message> <message> <location filename="../../FolderExistsDialog.cpp" line="122"/> - <source>%1 - copy</source> + <source>%name% - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="132"/> - <source>%1 - copy (%2)</source> + <location filename="../../FolderExistsDialog.cpp" line="131"/> + <source>%name% - copy (%number%)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="193"/> + <location filename="../../FolderExistsDialog.cpp" line="190"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="193"/> + <location filename="../../FolderExistsDialog.cpp" line="190"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -486,49 +486,49 @@ <context> <name>ListThread</name> <message> - <location filename="../../ListThread.cpp" line="1482"/> - <location filename="../../ListThread.cpp" line="2414"/> + <location filename="../../ListThread.cpp" line="1487"/> + <location filename="../../ListThread.cpp" line="2419"/> <source>Unable do to move or copy item into wrong forced mode: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1489"/> - <location filename="../../ListThread.cpp" line="2421"/> + <location filename="../../ListThread.cpp" line="1494"/> + <location filename="../../ListThread.cpp" line="2426"/> <source>Unable to save the transfer list: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1505"/> + <location filename="../../ListThread.cpp" line="1510"/> <source>Problem reading file, or file-size is 0</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1512"/> + <location filename="../../ListThread.cpp" line="1517"/> <source>Wrong header: "%1"</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1521"/> + <location filename="../../ListThread.cpp" line="1526"/> <source>The transfer list is in mixed mode, but this instance is not in this mode</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1530"/> + <location filename="../../ListThread.cpp" line="1535"/> <source>The transfer list is in copy mode, but this instance is not in this mode</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1536"/> + <location filename="../../ListThread.cpp" line="1541"/> <source>The transfer list is in move mode, but this instance is not in this mode</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1599"/> + <location filename="../../ListThread.cpp" line="1604"/> <source>Some errors have been found during the line parsing</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1607"/> + <location filename="../../ListThread.cpp" line="1612"/> <source>Unable to open the transfer list: %1</source> <translation type="unfinished"></translation> </message> @@ -570,24 +570,24 @@ <context> <name>ReadThread</name> <message> - <location filename="../../ReadThread.cpp" line="55"/> + <location filename="../../ReadThread.cpp" line="59"/> <source>Internal error, please report it!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ReadThread.cpp" line="184"/> + <location filename="../../ReadThread.cpp" line="188"/> <source>Internal error reading the source file:block size out of range</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ReadThread.cpp" line="192"/> - <location filename="../../ReadThread.cpp" line="408"/> + <location filename="../../ReadThread.cpp" line="196"/> + <location filename="../../ReadThread.cpp" line="420"/> <source>Unable to read the source file: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ReadThread.cpp" line="233"/> - <location filename="../../ReadThread.cpp" line="456"/> + <location filename="../../ReadThread.cpp" line="237"/> + <location filename="../../ReadThread.cpp" line="468"/> <source>File truncated during the read, possible data change</source> <translation type="unfinished"></translation> </message> @@ -595,37 +595,31 @@ <context> <name>RenamingRules</name> <message> - <location filename="../../RenamingRules.ui" line="26"/> + <location filename="../../RenamingRules.ui" line="35"/> <source>First renaming</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../RenamingRules.ui" line="32"/> - <source>%name% - copy</source> + <location filename="../../RenamingRules.ui" line="41"/> + <source>%name% - copy%suffix%</source> <extracomment>%name% should not be translated</extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../../RenamingRules.ui" line="39"/> - <source><html><head/><body><p>Variables: <span style=" font-weight:600;">%name%</span> for the original file name</p></body></html></source> - <extracomment> should not be translated</extracomment> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../RenamingRules.ui" line="49"/> - <source>Second renaming</source> + <location filename="../../RenamingRules.ui" line="57"/> + <source>%name% - copy (%number%)%suffix%</source> + <extracomment>%name%, %number% should not be translated</extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../../RenamingRules.ui" line="55"/> - <source>%name% - copy (%number%)</source> + <location filename="../../RenamingRules.ui" line="67"/> + <source><html><head/><body><p>Variables: <span style=" font-weight:600;">%name%</span> for the original file name, <span style=" font-weight:600;">%number%</span> for the extra number, <span style=" font-weight:600;">%suffix%</span> file suffix</p></body></html></source> <extracomment>%name%, %number% should not be translated</extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../../RenamingRules.ui" line="62"/> - <source><html><head/><body><p>Variables: <span style=" font-weight:600;">%name%</span> for the original file name</p><p><span style=" font-weight:600;">%number%</span> for the extra number</p></body></html></source> - <extracomment>%name%, %number% should not be translated</extracomment> + <location filename="../../RenamingRules.ui" line="51"/> + <source>Second renaming</source> <translation type="unfinished"></translation> </message> <message> @@ -655,33 +649,41 @@ </message> <message> <location filename="../../ScanFileOrFolder.cpp" line="338"/> - <location filename="../../ScanFileOrFolder.cpp" line="404"/> <source>%1 - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="348"/> - <location filename="../../ScanFileOrFolder.cpp" line="414"/> + <location filename="../../ScanFileOrFolder.cpp" line="345"/> <source>%1 - copy (%2)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="452"/> + <location filename="../../ScanFileOrFolder.cpp" line="401"/> + <source>%name% - copy</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../ScanFileOrFolder.cpp" line="408"/> + <source>%name% - copy (%number%)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../ScanFileOrFolder.cpp" line="444"/> <source>This is not a folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="454"/> + <location filename="../../ScanFileOrFolder.cpp" line="446"/> <source>The folder does exists</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="456"/> + <location filename="../../ScanFileOrFolder.cpp" line="448"/> <source>The folder is not readable</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="467"/> + <location filename="../../ScanFileOrFolder.cpp" line="459"/> <source>Problem with name encoding</source> <translation type="unfinished"></translation> </message> @@ -690,9 +692,9 @@ <name>TransferThread</name> <message> <location filename="../../TransferThread.cpp" line="244"/> - <location filename="../../TransferThread.cpp" line="677"/> - <location filename="../../TransferThread.cpp" line="749"/> - <location filename="../../TransferThread.cpp" line="1319"/> + <location filename="../../TransferThread.cpp" line="673"/> + <location filename="../../TransferThread.cpp" line="745"/> + <location filename="../../TransferThread.cpp" line="1315"/> <source>File not found</source> <translation type="unfinished"></translation> </message> @@ -725,60 +727,60 @@ </message> <message> <location filename="../../TransferThread.cpp" line="645"/> - <source>%1 - copy</source> + <source>%name% - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="655"/> - <source>%1 - copy (%2)</source> + <location filename="../../TransferThread.cpp" line="652"/> + <source>%name% - copy (%number%)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="715"/> - <location filename="../../TransferThread.cpp" line="830"/> + <location filename="../../TransferThread.cpp" line="711"/> + <location filename="../../TransferThread.cpp" line="826"/> <source>The source file doesn't exist</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="755"/> - <location filename="../../TransferThread.cpp" line="842"/> + <location filename="../../TransferThread.cpp" line="751"/> + <location filename="../../TransferThread.cpp" line="838"/> <source>Unable to do the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="791"/> + <location filename="../../TransferThread.cpp" line="787"/> <source>The source doesn't exist</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="836"/> + <location filename="../../TransferThread.cpp" line="832"/> <source>Another file exists at same place</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1138"/> + <location filename="../../TransferThread.cpp" line="1134"/> <source>The checksums do not match</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1228"/> + <location filename="../../TransferThread.cpp" line="1224"/> <source>Internal error: The destination is not closed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1243"/> + <location filename="../../TransferThread.cpp" line="1239"/> <source>Internal error: The size transfered doesn't match</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1254"/> + <location filename="../../TransferThread.cpp" line="1250"/> <source>Internal error: The buffer is not empty</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1319"/> - <location filename="../../TransferThread.cpp" line="1337"/> - <location filename="../../TransferThread.cpp" line="1352"/> + <location filename="../../TransferThread.cpp" line="1315"/> + <location filename="../../TransferThread.cpp" line="1333"/> + <location filename="../../TransferThread.cpp" line="1348"/> <source>Unable to change the date</source> <translation type="unfinished"></translation> </message> @@ -791,22 +793,22 @@ <context> <name>WriteThread</name> <message> - <location filename="../../WriteThread.cpp" line="80"/> + <location filename="../../WriteThread.cpp" line="83"/> <source>Path resolution error (Empty path)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../WriteThread.cpp" line="269"/> + <location filename="../../WriteThread.cpp" line="277"/> <source>Internal error, please report it!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../WriteThread.cpp" line="672"/> + <location filename="../../WriteThread.cpp" line="680"/> <source>Unable to read the source file: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../WriteThread.cpp" line="697"/> + <location filename="../../WriteThread.cpp" line="705"/> <source>File truncated during read, possible data change</source> <translation type="unfinished"></translation> </message> @@ -814,198 +816,198 @@ <context> <name>copyEngineOptions</name> <message> - <location filename="../../copyEngineOptions.ui" line="35"/> + <location filename="../../copyEngineOptions.ui" line="44"/> <source>Transfer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="44"/> + <location filename="../../copyEngineOptions.ui" line="53"/> <source>Move the whole folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="51"/> + <location filename="../../copyEngineOptions.ui" line="60"/> <source>Transfer the file rights</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="61"/> + <location filename="../../copyEngineOptions.ui" line="70"/> <source>Keep the file date</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="74"/> + <location filename="../../copyEngineOptions.ui" line="83"/> <source>Autostart the transfer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="81"/> - <location filename="../../copyEngineOptions.ui" line="101"/> + <location filename="../../copyEngineOptions.ui" line="90"/> + <location filename="../../copyEngineOptions.ui" line="110"/> <source>Less performance if checked</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="104"/> + <location filename="../../copyEngineOptions.ui" line="113"/> <source>Follow the strict order</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="130"/> + <location filename="../../copyEngineOptions.ui" line="139"/> <source>Error and collision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="136"/> + <location filename="../../copyEngineOptions.ui" line="145"/> <source>When folder error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="146"/> + <location filename="../../copyEngineOptions.ui" line="155"/> <source>When file error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="172"/> + <location filename="../../copyEngineOptions.ui" line="181"/> <source>When file collision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="232"/> + <location filename="../../copyEngineOptions.ui" line="241"/> <source>When folder collision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="263"/> + <location filename="../../copyEngineOptions.ui" line="272"/> <source>Check if destination folder exists</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="270"/> + <location filename="../../copyEngineOptions.ui" line="279"/> <source>Renaming rules</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="290"/> + <location filename="../../copyEngineOptions.ui" line="299"/> <source>Delete partially transferred files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="303"/> + <location filename="../../copyEngineOptions.ui" line="312"/> <source>Rename the original destination</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="334"/> + <location filename="../../copyEngineOptions.ui" line="343"/> <source>Control</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="340"/> + <location filename="../../copyEngineOptions.ui" line="349"/> <source>Checksum</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="349"/> + <location filename="../../copyEngineOptions.ui" line="358"/> <source>Only after error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="356"/> + <location filename="../../copyEngineOptions.ui" line="365"/> <source>Ignore if impossible</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="373"/> + <location filename="../../copyEngineOptions.ui" line="382"/> <source>Verify checksums</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="405"/> + <location filename="../../copyEngineOptions.ui" line="414"/> <source>Performance</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="411"/> + <location filename="../../copyEngineOptions.ui" line="420"/> <source>Parallel buffer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="418"/> - <location filename="../../copyEngineOptions.ui" line="431"/> - <location filename="../../copyEngineOptions.ui" line="444"/> - <location filename="../../copyEngineOptions.ui" line="481"/> - <location filename="../../copyEngineOptions.ui" line="550"/> + <location filename="../../copyEngineOptions.ui" line="427"/> + <location filename="../../copyEngineOptions.ui" line="440"/> + <location filename="../../copyEngineOptions.ui" line="453"/> + <location filename="../../copyEngineOptions.ui" line="490"/> + <location filename="../../copyEngineOptions.ui" line="559"/> <source>KB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="460"/> + <location filename="../../copyEngineOptions.ui" line="469"/> <source>Block size</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="467"/> + <location filename="../../copyEngineOptions.ui" line="476"/> <source>Sequential buffer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="474"/> + <location filename="../../copyEngineOptions.ui" line="483"/> <source>Enable OS buffer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="497"/> + <location filename="../../copyEngineOptions.ui" line="506"/> <source>OS buffer only if smaller than</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="504"/> + <location filename="../../copyEngineOptions.ui" line="513"/> <source>Transfer algorithm</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="543"/> + <location filename="../../copyEngineOptions.ui" line="552"/> <source>Parallelize if smaller than</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="573"/> - <source>Inode threads</source> + <location filename="../../copyEngineOptions.ui" line="582"/> + <source>Inode threads (unsafe > 1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="580"/> - <location filename="../../copyEngineOptions.ui" line="590"/> + <location filename="../../copyEngineOptions.ui" line="589"/> + <location filename="../../copyEngineOptions.ui" line="599"/> <source>More cpu, but better organisation on the disk</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="593"/> + <location filename="../../copyEngineOptions.ui" line="602"/> <source>Order the list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="609"/> + <location filename="../../copyEngineOptions.ui" line="618"/> <source>Misc</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="615"/> + <location filename="../../copyEngineOptions.ui" line="624"/> <source>Check the disk space</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="625"/> + <location filename="../../copyEngineOptions.ui" line="634"/> <source>Use this folder when destination is not set</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="637"/> + <location filename="../../copyEngineOptions.ui" line="646"/> <source>Browse</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="659"/> + <location filename="../../copyEngineOptions.ui" line="668"/> <source>Filters</source> <translation type="unfinished"></translation> </message> diff --git a/plugins/CopyEngine/Ultracopier/Languages/de/translation.ts b/plugins/CopyEngine/Ultracopier/Languages/de/translation.ts index 5f57544..fb6408e 100644 --- a/plugins/CopyEngine/Ultracopier/Languages/de/translation.ts +++ b/plugins/CopyEngine/Ultracopier/Languages/de/translation.ts @@ -147,85 +147,85 @@ <context> <name>CopyEngineFactory</name> <message> - <location filename="../../CopyEngineFactory.cpp" line="419"/> - <location filename="../../CopyEngineFactory.cpp" line="422"/> <location filename="../../CopyEngineFactory.cpp" line="427"/> - <location filename="../../CopyEngineFactory.cpp" line="431"/> + <location filename="../../CopyEngineFactory.cpp" line="430"/> + <location filename="../../CopyEngineFactory.cpp" line="435"/> + <location filename="../../CopyEngineFactory.cpp" line="439"/> <source>Ask</source> <translation>Fragen</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="420"/> - <location filename="../../CopyEngineFactory.cpp" line="424"/> <location filename="../../CopyEngineFactory.cpp" line="428"/> <location filename="../../CopyEngineFactory.cpp" line="432"/> + <location filename="../../CopyEngineFactory.cpp" line="436"/> + <location filename="../../CopyEngineFactory.cpp" line="440"/> <source>Skip</source> <translation>Überspringen</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="423"/> + <location filename="../../CopyEngineFactory.cpp" line="431"/> <source>Merge</source> <translation>Fusionieren</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="425"/> - <location filename="../../CopyEngineFactory.cpp" line="437"/> + <location filename="../../CopyEngineFactory.cpp" line="433"/> + <location filename="../../CopyEngineFactory.cpp" line="445"/> <source>Rename</source> <translation>Umbenennen</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="429"/> + <location filename="../../CopyEngineFactory.cpp" line="437"/> <source>Put at the end</source> <translation>Ans Ende verschieben</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="433"/> + <location filename="../../CopyEngineFactory.cpp" line="441"/> <source>Overwrite</source> <translation>Überschreiben</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="434"/> + <location filename="../../CopyEngineFactory.cpp" line="442"/> <source>Overwrite if different</source> <translation>Überschreiben, falls verschieden</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="435"/> + <location filename="../../CopyEngineFactory.cpp" line="443"/> <source>Overwrite if newer</source> <translation>Überschreiben, falls neuer</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="436"/> + <location filename="../../CopyEngineFactory.cpp" line="444"/> <source>Overwrite if older</source> <translation>Überschreiben, falls älter</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="439"/> + <location filename="../../CopyEngineFactory.cpp" line="447"/> <source>Automatic</source> <translation>Automatisch</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="440"/> + <location filename="../../CopyEngineFactory.cpp" line="448"/> <source>Sequential</source> <translation>Sequentiell</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="441"/> + <location filename="../../CopyEngineFactory.cpp" line="449"/> <source>Parallel</source> <translation>Parallel</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="492"/> - <location filename="../../CopyEngineFactory.cpp" line="531"/> + <location filename="../../CopyEngineFactory.cpp" line="500"/> + <location filename="../../CopyEngineFactory.cpp" line="539"/> <source>Options error</source> <translation>Fehlerhafte Optionen</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="492"/> + <location filename="../../CopyEngineFactory.cpp" line="500"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation>Option nicht geladen - Kein Zugriff auf Filter</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="531"/> + <location filename="../../CopyEngineFactory.cpp" line="539"/> <source>Options engine is not loaded, can't access to the filters</source> <translation>Option nicht geladen - Kann nicht auf Filter zugreifen</translation> </message> @@ -275,21 +275,21 @@ <name>FileExistsDialog</name> <message> <location filename="../../FileExistsDialog.cpp" line="137"/> - <source>%1 - copy</source> - <translation>%1 - Kopie</translation> + <source>%name% - copy%suffix%</source> + <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="147"/> - <source>%1 - copy (%2)</source> - <translation>%1 - Kopie (%2)</translation> + <location filename="../../FileExistsDialog.cpp" line="144"/> + <source>%name% - copy (%number%)%suffix%</source> + <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="232"/> + <location filename="../../FileExistsDialog.cpp" line="228"/> <source>Error</source> <translation>Fehler</translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="232"/> + <location filename="../../FileExistsDialog.cpp" line="228"/> <source>Try rename with using special characters</source> <translation>Versuche Umbenennung mit Sonderzeichen</translation> </message> @@ -298,21 +298,21 @@ <name>FileIsSameDialog</name> <message> <location filename="../../FileIsSameDialog.cpp" line="111"/> - <source>%1 - copy</source> - <translation>%1 - kopieren</translation> + <source>%name% - copy</source> + <translation type="unfinished">%name% - Kopie</translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="121"/> - <source>%1 - copy (%2)</source> - <translation>%1 - kopieren (%2)</translation> + <location filename="../../FileIsSameDialog.cpp" line="118"/> + <source>%name% - copy (%number%)</source> + <translation type="unfinished">%name% - Kopie (%number%)</translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="188"/> + <location filename="../../FileIsSameDialog.cpp" line="184"/> <source>Error</source> <translation>Fehler</translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="188"/> + <location filename="../../FileIsSameDialog.cpp" line="184"/> <source>Try rename with using special characters</source> <translation>Versuche Umbenennung mit Sonderzeichen</translation> </message> @@ -465,21 +465,21 @@ </message> <message> <location filename="../../FolderExistsDialog.cpp" line="122"/> - <source>%1 - copy</source> - <translation>%1 - Kopie</translation> + <source>%name% - copy</source> + <translation type="unfinished">%name% - Kopie</translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="132"/> - <source>%1 - copy (%2)</source> - <translation>%1 - Kopie (%2)</translation> + <location filename="../../FolderExistsDialog.cpp" line="131"/> + <source>%name% - copy (%number%)</source> + <translation type="unfinished">%name% - Kopie (%number%)</translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="193"/> + <location filename="../../FolderExistsDialog.cpp" line="190"/> <source>Error</source> <translation>Fehler</translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="193"/> + <location filename="../../FolderExistsDialog.cpp" line="190"/> <source>Try rename with using special characters</source> <translation>Versuche Umbenennung mit Sonderzeichen</translation> </message> @@ -487,49 +487,49 @@ <context> <name>ListThread</name> <message> - <location filename="../../ListThread.cpp" line="1482"/> - <location filename="../../ListThread.cpp" line="2414"/> + <location filename="../../ListThread.cpp" line="1487"/> + <location filename="../../ListThread.cpp" line="2419"/> <source>Unable do to move or copy item into wrong forced mode: %1</source> <translation>Falscher Modus: %1 - Kann Element nicht verschieben oder kopieren</translation> </message> <message> - <location filename="../../ListThread.cpp" line="1489"/> - <location filename="../../ListThread.cpp" line="2421"/> + <location filename="../../ListThread.cpp" line="1494"/> + <location filename="../../ListThread.cpp" line="2426"/> <source>Unable to save the transfer list: %1</source> <translation>Konnte die Transferliste: %1 nicht speichern</translation> </message> <message> - <location filename="../../ListThread.cpp" line="1505"/> + <location filename="../../ListThread.cpp" line="1510"/> <source>Problem reading file, or file-size is 0</source> <translation>Lesefehler, oder Dateigröße=0</translation> </message> <message> - <location filename="../../ListThread.cpp" line="1512"/> + <location filename="../../ListThread.cpp" line="1517"/> <source>Wrong header: "%1"</source> <translation>Falscher Header: "%1"</translation> </message> <message> - <location filename="../../ListThread.cpp" line="1521"/> + <location filename="../../ListThread.cpp" line="1526"/> <source>The transfer list is in mixed mode, but this instance is not in this mode</source> <translation>Die Transferliste ist im gemischten Modus, aber diese Instanz ist nicht im selben Modus</translation> </message> <message> - <location filename="../../ListThread.cpp" line="1530"/> + <location filename="../../ListThread.cpp" line="1535"/> <source>The transfer list is in copy mode, but this instance is not in this mode</source> <translation>Die Transferliste ist im Kopiermodus, aber diese Instanz ist nicht im selben Modus</translation> </message> <message> - <location filename="../../ListThread.cpp" line="1536"/> + <location filename="../../ListThread.cpp" line="1541"/> <source>The transfer list is in move mode, but this instance is not in this mode</source> <translation>Die Transferliste ist im Verschiebe-Modus, aber diese Instanz ist nicht im selben Modus</translation> </message> <message> - <location filename="../../ListThread.cpp" line="1599"/> + <location filename="../../ListThread.cpp" line="1604"/> <source>Some errors have been found during the line parsing</source> <translation>Bei der Zeilenanalyse sind Fehler aufgetreten</translation> </message> <message> - <location filename="../../ListThread.cpp" line="1607"/> + <location filename="../../ListThread.cpp" line="1612"/> <source>Unable to open the transfer list: %1</source> <translation>Transferliste: %1 kann nicht geöffnet werden</translation> </message> @@ -571,24 +571,24 @@ <context> <name>ReadThread</name> <message> - <location filename="../../ReadThread.cpp" line="55"/> + <location filename="../../ReadThread.cpp" line="59"/> <source>Internal error, please report it!</source> <translation>Interner Fehler - Bitte bei mir melden!</translation> </message> <message> - <location filename="../../ReadThread.cpp" line="184"/> + <location filename="../../ReadThread.cpp" line="188"/> <source>Internal error reading the source file:block size out of range</source> <translation>Interner Fehler beim Lesen der Quelldatei: Blockgröße außerhalb des zulässigen Bereichs</translation> </message> <message> - <location filename="../../ReadThread.cpp" line="192"/> - <location filename="../../ReadThread.cpp" line="408"/> + <location filename="../../ReadThread.cpp" line="196"/> + <location filename="../../ReadThread.cpp" line="420"/> <source>Unable to read the source file: </source> <translation>Die Quelldatei kann nicht gelesen werden: </translation> </message> <message> - <location filename="../../ReadThread.cpp" line="233"/> - <location filename="../../ReadThread.cpp" line="456"/> + <location filename="../../ReadThread.cpp" line="237"/> + <location filename="../../ReadThread.cpp" line="468"/> <source>File truncated during the read, possible data change</source> <translation>Datei während des Lesevorgangs abgeschnitten, Daten wurden möglicherweise verändert</translation> </message> @@ -596,38 +596,32 @@ <context> <name>RenamingRules</name> <message> - <location filename="../../RenamingRules.ui" line="26"/> + <location filename="../../RenamingRules.ui" line="35"/> <source>First renaming</source> <translation>Erste Umbenennung</translation> </message> <message> - <location filename="../../RenamingRules.ui" line="32"/> - <source>%name% - copy</source> + <location filename="../../RenamingRules.ui" line="41"/> + <source>%name% - copy%suffix%</source> <extracomment>%name% should not be translated</extracomment> - <translation>%name% - Kopie</translation> - </message> - <message> - <location filename="../../RenamingRules.ui" line="39"/> - <source><html><head/><body><p>Variables: <span style=" font-weight:600;">%name%</span> for the original file name</p></body></html></source> - <extracomment> should not be translated</extracomment> - <translation><html><head/><body><p>Variablen: <span style=" font-weight:600;">%name%</span> für den ursprünglichen Dateinamen</p></body></html></translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="../../RenamingRules.ui" line="49"/> - <source>Second renaming</source> - <translation>Zweite Umbenennung</translation> + <location filename="../../RenamingRules.ui" line="57"/> + <source>%name% - copy (%number%)%suffix%</source> + <extracomment>%name%, %number% should not be translated</extracomment> + <translation type="unfinished"></translation> </message> <message> - <location filename="../../RenamingRules.ui" line="55"/> - <source>%name% - copy (%number%)</source> + <location filename="../../RenamingRules.ui" line="67"/> + <source><html><head/><body><p>Variables: <span style=" font-weight:600;">%name%</span> for the original file name, <span style=" font-weight:600;">%number%</span> for the extra number, <span style=" font-weight:600;">%suffix%</span> file suffix</p></body></html></source> <extracomment>%name%, %number% should not be translated</extracomment> - <translation>%name% - Kopie (%number%)</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="../../RenamingRules.ui" line="62"/> - <source><html><head/><body><p>Variables: <span style=" font-weight:600;">%name%</span> for the original file name</p><p><span style=" font-weight:600;">%number%</span> for the extra number</p></body></html></source> - <extracomment>%name%, %number% should not be translated</extracomment> - <translation><html><head/><body><p>Variablen: <span style=" font-weight:600;">%name%</span> für den ursprünglichen Dateinamen</p><p><span style=" font-weight:600;">%number%</span> für die zusätzliche Zahl</p></body></html></translation> + <location filename="../../RenamingRules.ui" line="51"/> + <source>Second renaming</source> + <translation>Zweite Umbenennung</translation> </message> <message> <location filename="../../RenamingRules.cpp" line="39"/> @@ -656,33 +650,41 @@ </message> <message> <location filename="../../ScanFileOrFolder.cpp" line="338"/> - <location filename="../../ScanFileOrFolder.cpp" line="404"/> <source>%1 - copy</source> <translation>%1 - Kopie</translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="348"/> - <location filename="../../ScanFileOrFolder.cpp" line="414"/> + <location filename="../../ScanFileOrFolder.cpp" line="345"/> <source>%1 - copy (%2)</source> <translation>%1 - Kopie (%2)</translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="452"/> + <location filename="../../ScanFileOrFolder.cpp" line="401"/> + <source>%name% - copy</source> + <translation type="unfinished">%name% - Kopie</translation> + </message> + <message> + <location filename="../../ScanFileOrFolder.cpp" line="408"/> + <source>%name% - copy (%number%)</source> + <translation type="unfinished">%name% - Kopie (%number%)</translation> + </message> + <message> + <location filename="../../ScanFileOrFolder.cpp" line="444"/> <source>This is not a folder</source> <translation>Dies ist kein Ordner</translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="454"/> + <location filename="../../ScanFileOrFolder.cpp" line="446"/> <source>The folder does exists</source> <translation>Ordner existiert bereits</translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="456"/> + <location filename="../../ScanFileOrFolder.cpp" line="448"/> <source>The folder is not readable</source> <translation>Der Ordner kann nicht gelesen werden</translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="467"/> + <location filename="../../ScanFileOrFolder.cpp" line="459"/> <source>Problem with name encoding</source> <translation>Problem mit der Namen-Encodierung</translation> </message> @@ -691,9 +693,9 @@ <name>TransferThread</name> <message> <location filename="../../TransferThread.cpp" line="244"/> - <location filename="../../TransferThread.cpp" line="677"/> - <location filename="../../TransferThread.cpp" line="749"/> - <location filename="../../TransferThread.cpp" line="1319"/> + <location filename="../../TransferThread.cpp" line="673"/> + <location filename="../../TransferThread.cpp" line="745"/> + <location filename="../../TransferThread.cpp" line="1315"/> <source>File not found</source> <translation>Datei nicht gefunden</translation> </message> @@ -725,46 +727,36 @@ <translation type="unfinished">Stammverzeichnis</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="645"/> - <source>%1 - copy</source> - <translation type="unfinished">%1 - Kopie</translation> - </message> - <message> - <location filename="../../TransferThread.cpp" line="655"/> - <source>%1 - copy (%2)</source> - <translation type="unfinished">%1 - Kopie (%2)</translation> - </message> - <message> - <location filename="../../TransferThread.cpp" line="791"/> + <location filename="../../TransferThread.cpp" line="787"/> <source>The source doesn't exist</source> <translation type="unfinished">Quelle existiert nicht</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1319"/> - <location filename="../../TransferThread.cpp" line="1337"/> - <location filename="../../TransferThread.cpp" line="1352"/> + <location filename="../../TransferThread.cpp" line="1315"/> + <location filename="../../TransferThread.cpp" line="1333"/> + <location filename="../../TransferThread.cpp" line="1348"/> <source>Unable to change the date</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="715"/> - <location filename="../../TransferThread.cpp" line="830"/> + <location filename="../../TransferThread.cpp" line="711"/> + <location filename="../../TransferThread.cpp" line="826"/> <source>The source file doesn't exist</source> <translation type="unfinished">Quelldatei existiert nicht</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1138"/> + <location filename="../../TransferThread.cpp" line="1134"/> <source>The checksums do not match</source> <translation type="unfinished">Prüfsummen sind verschieden</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1243"/> + <location filename="../../TransferThread.cpp" line="1239"/> <source>Internal error: The size transfered doesn't match</source> <translation type="unfinished">Interner Fehler: Ubertragene Größe ungleich</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="755"/> - <location filename="../../TransferThread.cpp" line="842"/> + <location filename="../../TransferThread.cpp" line="751"/> + <location filename="../../TransferThread.cpp" line="838"/> <source>Unable to do the folder</source> <translation type="unfinished">Ordner kann nicht erstellt werden</translation> </message> @@ -774,17 +766,27 @@ <translation>Versuche Umbenennung mit Sonderzeichen</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="836"/> + <location filename="../../TransferThread.cpp" line="645"/> + <source>%name% - copy</source> + <translation type="unfinished">%name% - Kopie</translation> + </message> + <message> + <location filename="../../TransferThread.cpp" line="652"/> + <source>%name% - copy (%number%)</source> + <translation type="unfinished">%name% - Kopie (%number%)</translation> + </message> + <message> + <location filename="../../TransferThread.cpp" line="832"/> <source>Another file exists at same place</source> <translation type="unfinished">Andere Datei befindet sich am selben Ort</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1228"/> + <location filename="../../TransferThread.cpp" line="1224"/> <source>Internal error: The destination is not closed</source> <translation type="unfinished">Interner Fehler: Ziel ist nicht geschlossen</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1254"/> + <location filename="../../TransferThread.cpp" line="1250"/> <source>Internal error: The buffer is not empty</source> <translation type="unfinished">Interner Fehler: Puffer ist nicht leer</translation> </message> @@ -792,22 +794,22 @@ <context> <name>WriteThread</name> <message> - <location filename="../../WriteThread.cpp" line="80"/> + <location filename="../../WriteThread.cpp" line="83"/> <source>Path resolution error (Empty path)</source> <translation>Pfad-Auflösungsfehler (leerer Pfad)</translation> </message> <message> - <location filename="../../WriteThread.cpp" line="269"/> + <location filename="../../WriteThread.cpp" line="277"/> <source>Internal error, please report it!</source> <translation>Interner Fehler - Bitte bei mir melden!</translation> </message> <message> - <location filename="../../WriteThread.cpp" line="672"/> + <location filename="../../WriteThread.cpp" line="680"/> <source>Unable to read the source file: </source> <translation>Quelldatei kann nicht gelesen werden: </translation> </message> <message> - <location filename="../../WriteThread.cpp" line="697"/> + <location filename="../../WriteThread.cpp" line="705"/> <source>File truncated during read, possible data change</source> <translation>Datenabbruch beim Lesen, Daten wurden möglicherweise verändert</translation> </message> @@ -815,198 +817,198 @@ <context> <name>copyEngineOptions</name> <message> - <location filename="../../copyEngineOptions.ui" line="35"/> + <location filename="../../copyEngineOptions.ui" line="44"/> <source>Transfer</source> <translation>Übertragung</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="44"/> + <location filename="../../copyEngineOptions.ui" line="53"/> <source>Move the whole folder</source> <translation>Verschiebe den ganzen Ordner</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="51"/> + <location filename="../../copyEngineOptions.ui" line="60"/> <source>Transfer the file rights</source> <translation>Übertrage die Dateirechte</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="61"/> + <location filename="../../copyEngineOptions.ui" line="70"/> <source>Keep the file date</source> <translation>Datum der Dateien beibehalten</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="74"/> + <location filename="../../copyEngineOptions.ui" line="83"/> <source>Autostart the transfer</source> <translation>Übertragung automatisch starten</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="81"/> - <location filename="../../copyEngineOptions.ui" line="101"/> + <location filename="../../copyEngineOptions.ui" line="90"/> + <location filename="../../copyEngineOptions.ui" line="110"/> <source>Less performance if checked</source> <translation>Leistung drosseln</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="104"/> + <location filename="../../copyEngineOptions.ui" line="113"/> <source>Follow the strict order</source> <translation>Genau nach Reihenfolge</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="130"/> + <location filename="../../copyEngineOptions.ui" line="139"/> <source>Error and collision</source> <translation>Fehler und Kollision</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="136"/> + <location filename="../../copyEngineOptions.ui" line="145"/> <source>When folder error</source> <translation>Bei Ordnerfehlern:</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="146"/> + <location filename="../../copyEngineOptions.ui" line="155"/> <source>When file error</source> <translation>Bei Dateifehlern:</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="172"/> + <location filename="../../copyEngineOptions.ui" line="181"/> <source>When file collision</source> <translation>Bei Dateikollisionen:</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="232"/> + <location filename="../../copyEngineOptions.ui" line="241"/> <source>When folder collision</source> <translation>Bei Ordnerkollisionen:</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="263"/> + <location filename="../../copyEngineOptions.ui" line="272"/> <source>Check if destination folder exists</source> <translation>Prüfen ob Zielordner vorhanden ist</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="270"/> + <location filename="../../copyEngineOptions.ui" line="279"/> <source>Renaming rules</source> <translation>Umbennungsregeln</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="290"/> + <location filename="../../copyEngineOptions.ui" line="299"/> <source>Delete partially transferred files</source> <translation>Unvollständig übertragene Dateien löschen</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="303"/> + <location filename="../../copyEngineOptions.ui" line="312"/> <source>Rename the original destination</source> <translation>Original-Ziel umbenennen</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="334"/> + <location filename="../../copyEngineOptions.ui" line="343"/> <source>Control</source> <translation>Überprüfung</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="340"/> + <location filename="../../copyEngineOptions.ui" line="349"/> <source>Checksum</source> <translation>Prüfsumme</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="349"/> + <location filename="../../copyEngineOptions.ui" line="358"/> <source>Only after error</source> <translation>Nur nach einem Fehler</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="356"/> + <location filename="../../copyEngineOptions.ui" line="365"/> <source>Ignore if impossible</source> <translation>Ignorieren falls unmöglich</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="373"/> + <location filename="../../copyEngineOptions.ui" line="382"/> <source>Verify checksums</source> <translation>Prüfsummen vergleichen</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="405"/> + <location filename="../../copyEngineOptions.ui" line="414"/> <source>Performance</source> <translation>Leistung</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="411"/> + <location filename="../../copyEngineOptions.ui" line="420"/> <source>Parallel buffer</source> <translation>Paralleler Puffer</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="418"/> - <location filename="../../copyEngineOptions.ui" line="431"/> - <location filename="../../copyEngineOptions.ui" line="444"/> - <location filename="../../copyEngineOptions.ui" line="481"/> - <location filename="../../copyEngineOptions.ui" line="550"/> + <location filename="../../copyEngineOptions.ui" line="427"/> + <location filename="../../copyEngineOptions.ui" line="440"/> + <location filename="../../copyEngineOptions.ui" line="453"/> + <location filename="../../copyEngineOptions.ui" line="490"/> + <location filename="../../copyEngineOptions.ui" line="559"/> <source>KB</source> <translation>KB</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="460"/> + <location filename="../../copyEngineOptions.ui" line="469"/> <source>Block size</source> <translation>Blockgröße</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="467"/> + <location filename="../../copyEngineOptions.ui" line="476"/> <source>Sequential buffer</source> <translation>Sequentieller Puffer</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="474"/> + <location filename="../../copyEngineOptions.ui" line="483"/> <source>Enable OS buffer</source> <translation>OS-Puffer aktivieren</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="497"/> + <location filename="../../copyEngineOptions.ui" line="506"/> <source>OS buffer only if smaller than</source> <translation>OS-Puffer nur verwenden, wenn kleiner als</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="504"/> + <location filename="../../copyEngineOptions.ui" line="513"/> <source>Transfer algorithm</source> <translation>Übertragungs-Algorithmus</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="543"/> + <location filename="../../copyEngineOptions.ui" line="552"/> <source>Parallelize if smaller than</source> <translation>Parallelisieren wenn kleiner als</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="573"/> - <source>Inode threads</source> - <translation>Inode Threads</translation> + <location filename="../../copyEngineOptions.ui" line="582"/> + <source>Inode threads (unsafe > 1)</source> + <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="580"/> - <location filename="../../copyEngineOptions.ui" line="590"/> + <location filename="../../copyEngineOptions.ui" line="589"/> + <location filename="../../copyEngineOptions.ui" line="599"/> <source>More cpu, but better organisation on the disk</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="593"/> + <location filename="../../copyEngineOptions.ui" line="602"/> <source>Order the list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="609"/> + <location filename="../../copyEngineOptions.ui" line="618"/> <source>Misc</source> <translation>Verschiedenes</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="615"/> + <location filename="../../copyEngineOptions.ui" line="624"/> <source>Check the disk space</source> <translation>Auf freien Speicherplatz überprüfen</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="625"/> + <location filename="../../copyEngineOptions.ui" line="634"/> <source>Use this folder when destination is not set</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="637"/> + <location filename="../../copyEngineOptions.ui" line="646"/> <source>Browse</source> <translation>Wählen</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="659"/> + <location filename="../../copyEngineOptions.ui" line="668"/> <source>Filters</source> <translation>Filter</translation> </message> diff --git a/plugins/CopyEngine/Ultracopier/Languages/el/translation.ts b/plugins/CopyEngine/Ultracopier/Languages/el/translation.ts index 4d395a0..e17b3f2 100644 --- a/plugins/CopyEngine/Ultracopier/Languages/el/translation.ts +++ b/plugins/CopyEngine/Ultracopier/Languages/el/translation.ts @@ -146,85 +146,85 @@ <context> <name>CopyEngineFactory</name> <message> - <location filename="../../CopyEngineFactory.cpp" line="419"/> - <location filename="../../CopyEngineFactory.cpp" line="422"/> <location filename="../../CopyEngineFactory.cpp" line="427"/> - <location filename="../../CopyEngineFactory.cpp" line="431"/> + <location filename="../../CopyEngineFactory.cpp" line="430"/> + <location filename="../../CopyEngineFactory.cpp" line="435"/> + <location filename="../../CopyEngineFactory.cpp" line="439"/> <source>Ask</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="420"/> - <location filename="../../CopyEngineFactory.cpp" line="424"/> <location filename="../../CopyEngineFactory.cpp" line="428"/> <location filename="../../CopyEngineFactory.cpp" line="432"/> + <location filename="../../CopyEngineFactory.cpp" line="436"/> + <location filename="../../CopyEngineFactory.cpp" line="440"/> <source>Skip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="423"/> + <location filename="../../CopyEngineFactory.cpp" line="431"/> <source>Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="425"/> - <location filename="../../CopyEngineFactory.cpp" line="437"/> + <location filename="../../CopyEngineFactory.cpp" line="433"/> + <location filename="../../CopyEngineFactory.cpp" line="445"/> <source>Rename</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="429"/> + <location filename="../../CopyEngineFactory.cpp" line="437"/> <source>Put at the end</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="433"/> + <location filename="../../CopyEngineFactory.cpp" line="441"/> <source>Overwrite</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="434"/> + <location filename="../../CopyEngineFactory.cpp" line="442"/> <source>Overwrite if different</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="435"/> + <location filename="../../CopyEngineFactory.cpp" line="443"/> <source>Overwrite if newer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="436"/> + <location filename="../../CopyEngineFactory.cpp" line="444"/> <source>Overwrite if older</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="439"/> + <location filename="../../CopyEngineFactory.cpp" line="447"/> <source>Automatic</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="440"/> + <location filename="../../CopyEngineFactory.cpp" line="448"/> <source>Sequential</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="441"/> + <location filename="../../CopyEngineFactory.cpp" line="449"/> <source>Parallel</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="492"/> - <location filename="../../CopyEngineFactory.cpp" line="531"/> + <location filename="../../CopyEngineFactory.cpp" line="500"/> + <location filename="../../CopyEngineFactory.cpp" line="539"/> <source>Options error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="492"/> + <location filename="../../CopyEngineFactory.cpp" line="500"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="531"/> + <location filename="../../CopyEngineFactory.cpp" line="539"/> <source>Options engine is not loaded, can't access to the filters</source> <translation type="unfinished"></translation> </message> @@ -274,21 +274,21 @@ <name>FileExistsDialog</name> <message> <location filename="../../FileExistsDialog.cpp" line="137"/> - <source>%1 - copy</source> + <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="147"/> - <source>%1 - copy (%2)</source> + <location filename="../../FileExistsDialog.cpp" line="144"/> + <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="232"/> + <location filename="../../FileExistsDialog.cpp" line="228"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="232"/> + <location filename="../../FileExistsDialog.cpp" line="228"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -297,21 +297,21 @@ <name>FileIsSameDialog</name> <message> <location filename="../../FileIsSameDialog.cpp" line="111"/> - <source>%1 - copy</source> + <source>%name% - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="121"/> - <source>%1 - copy (%2)</source> + <location filename="../../FileIsSameDialog.cpp" line="118"/> + <source>%name% - copy (%number%)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="188"/> + <location filename="../../FileIsSameDialog.cpp" line="184"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="188"/> + <location filename="../../FileIsSameDialog.cpp" line="184"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -464,21 +464,21 @@ </message> <message> <location filename="../../FolderExistsDialog.cpp" line="122"/> - <source>%1 - copy</source> + <source>%name% - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="132"/> - <source>%1 - copy (%2)</source> + <location filename="../../FolderExistsDialog.cpp" line="131"/> + <source>%name% - copy (%number%)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="193"/> + <location filename="../../FolderExistsDialog.cpp" line="190"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="193"/> + <location filename="../../FolderExistsDialog.cpp" line="190"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -486,49 +486,49 @@ <context> <name>ListThread</name> <message> - <location filename="../../ListThread.cpp" line="1482"/> - <location filename="../../ListThread.cpp" line="2414"/> + <location filename="../../ListThread.cpp" line="1487"/> + <location filename="../../ListThread.cpp" line="2419"/> <source>Unable do to move or copy item into wrong forced mode: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1489"/> - <location filename="../../ListThread.cpp" line="2421"/> + <location filename="../../ListThread.cpp" line="1494"/> + <location filename="../../ListThread.cpp" line="2426"/> <source>Unable to save the transfer list: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1505"/> + <location filename="../../ListThread.cpp" line="1510"/> <source>Problem reading file, or file-size is 0</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1512"/> + <location filename="../../ListThread.cpp" line="1517"/> <source>Wrong header: "%1"</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1521"/> + <location filename="../../ListThread.cpp" line="1526"/> <source>The transfer list is in mixed mode, but this instance is not in this mode</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1530"/> + <location filename="../../ListThread.cpp" line="1535"/> <source>The transfer list is in copy mode, but this instance is not in this mode</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1536"/> + <location filename="../../ListThread.cpp" line="1541"/> <source>The transfer list is in move mode, but this instance is not in this mode</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1599"/> + <location filename="../../ListThread.cpp" line="1604"/> <source>Some errors have been found during the line parsing</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1607"/> + <location filename="../../ListThread.cpp" line="1612"/> <source>Unable to open the transfer list: %1</source> <translation type="unfinished"></translation> </message> @@ -570,24 +570,24 @@ <context> <name>ReadThread</name> <message> - <location filename="../../ReadThread.cpp" line="55"/> + <location filename="../../ReadThread.cpp" line="59"/> <source>Internal error, please report it!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ReadThread.cpp" line="184"/> + <location filename="../../ReadThread.cpp" line="188"/> <source>Internal error reading the source file:block size out of range</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ReadThread.cpp" line="192"/> - <location filename="../../ReadThread.cpp" line="408"/> + <location filename="../../ReadThread.cpp" line="196"/> + <location filename="../../ReadThread.cpp" line="420"/> <source>Unable to read the source file: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ReadThread.cpp" line="233"/> - <location filename="../../ReadThread.cpp" line="456"/> + <location filename="../../ReadThread.cpp" line="237"/> + <location filename="../../ReadThread.cpp" line="468"/> <source>File truncated during the read, possible data change</source> <translation type="unfinished"></translation> </message> @@ -595,37 +595,31 @@ <context> <name>RenamingRules</name> <message> - <location filename="../../RenamingRules.ui" line="26"/> + <location filename="../../RenamingRules.ui" line="35"/> <source>First renaming</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../RenamingRules.ui" line="32"/> - <source>%name% - copy</source> + <location filename="../../RenamingRules.ui" line="41"/> + <source>%name% - copy%suffix%</source> <extracomment>%name% should not be translated</extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../../RenamingRules.ui" line="39"/> - <source><html><head/><body><p>Variables: <span style=" font-weight:600;">%name%</span> for the original file name</p></body></html></source> - <extracomment> should not be translated</extracomment> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../RenamingRules.ui" line="49"/> - <source>Second renaming</source> + <location filename="../../RenamingRules.ui" line="57"/> + <source>%name% - copy (%number%)%suffix%</source> + <extracomment>%name%, %number% should not be translated</extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../../RenamingRules.ui" line="55"/> - <source>%name% - copy (%number%)</source> + <location filename="../../RenamingRules.ui" line="67"/> + <source><html><head/><body><p>Variables: <span style=" font-weight:600;">%name%</span> for the original file name, <span style=" font-weight:600;">%number%</span> for the extra number, <span style=" font-weight:600;">%suffix%</span> file suffix</p></body></html></source> <extracomment>%name%, %number% should not be translated</extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../../RenamingRules.ui" line="62"/> - <source><html><head/><body><p>Variables: <span style=" font-weight:600;">%name%</span> for the original file name</p><p><span style=" font-weight:600;">%number%</span> for the extra number</p></body></html></source> - <extracomment>%name%, %number% should not be translated</extracomment> + <location filename="../../RenamingRules.ui" line="51"/> + <source>Second renaming</source> <translation type="unfinished"></translation> </message> <message> @@ -655,33 +649,41 @@ </message> <message> <location filename="../../ScanFileOrFolder.cpp" line="338"/> - <location filename="../../ScanFileOrFolder.cpp" line="404"/> <source>%1 - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="348"/> - <location filename="../../ScanFileOrFolder.cpp" line="414"/> + <location filename="../../ScanFileOrFolder.cpp" line="345"/> <source>%1 - copy (%2)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="452"/> + <location filename="../../ScanFileOrFolder.cpp" line="401"/> + <source>%name% - copy</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../ScanFileOrFolder.cpp" line="408"/> + <source>%name% - copy (%number%)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../ScanFileOrFolder.cpp" line="444"/> <source>This is not a folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="454"/> + <location filename="../../ScanFileOrFolder.cpp" line="446"/> <source>The folder does exists</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="456"/> + <location filename="../../ScanFileOrFolder.cpp" line="448"/> <source>The folder is not readable</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="467"/> + <location filename="../../ScanFileOrFolder.cpp" line="459"/> <source>Problem with name encoding</source> <translation type="unfinished"></translation> </message> @@ -690,9 +692,9 @@ <name>TransferThread</name> <message> <location filename="../../TransferThread.cpp" line="244"/> - <location filename="../../TransferThread.cpp" line="677"/> - <location filename="../../TransferThread.cpp" line="749"/> - <location filename="../../TransferThread.cpp" line="1319"/> + <location filename="../../TransferThread.cpp" line="673"/> + <location filename="../../TransferThread.cpp" line="745"/> + <location filename="../../TransferThread.cpp" line="1315"/> <source>File not found</source> <translation type="unfinished"></translation> </message> @@ -725,60 +727,60 @@ </message> <message> <location filename="../../TransferThread.cpp" line="645"/> - <source>%1 - copy</source> + <source>%name% - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="655"/> - <source>%1 - copy (%2)</source> + <location filename="../../TransferThread.cpp" line="652"/> + <source>%name% - copy (%number%)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="715"/> - <location filename="../../TransferThread.cpp" line="830"/> + <location filename="../../TransferThread.cpp" line="711"/> + <location filename="../../TransferThread.cpp" line="826"/> <source>The source file doesn't exist</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="755"/> - <location filename="../../TransferThread.cpp" line="842"/> + <location filename="../../TransferThread.cpp" line="751"/> + <location filename="../../TransferThread.cpp" line="838"/> <source>Unable to do the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="791"/> + <location filename="../../TransferThread.cpp" line="787"/> <source>The source doesn't exist</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="836"/> + <location filename="../../TransferThread.cpp" line="832"/> <source>Another file exists at same place</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1138"/> + <location filename="../../TransferThread.cpp" line="1134"/> <source>The checksums do not match</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1228"/> + <location filename="../../TransferThread.cpp" line="1224"/> <source>Internal error: The destination is not closed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1243"/> + <location filename="../../TransferThread.cpp" line="1239"/> <source>Internal error: The size transfered doesn't match</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1254"/> + <location filename="../../TransferThread.cpp" line="1250"/> <source>Internal error: The buffer is not empty</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1319"/> - <location filename="../../TransferThread.cpp" line="1337"/> - <location filename="../../TransferThread.cpp" line="1352"/> + <location filename="../../TransferThread.cpp" line="1315"/> + <location filename="../../TransferThread.cpp" line="1333"/> + <location filename="../../TransferThread.cpp" line="1348"/> <source>Unable to change the date</source> <translation type="unfinished"></translation> </message> @@ -791,22 +793,22 @@ <context> <name>WriteThread</name> <message> - <location filename="../../WriteThread.cpp" line="80"/> + <location filename="../../WriteThread.cpp" line="83"/> <source>Path resolution error (Empty path)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../WriteThread.cpp" line="269"/> + <location filename="../../WriteThread.cpp" line="277"/> <source>Internal error, please report it!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../WriteThread.cpp" line="672"/> + <location filename="../../WriteThread.cpp" line="680"/> <source>Unable to read the source file: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../WriteThread.cpp" line="697"/> + <location filename="../../WriteThread.cpp" line="705"/> <source>File truncated during read, possible data change</source> <translation type="unfinished"></translation> </message> @@ -814,198 +816,198 @@ <context> <name>copyEngineOptions</name> <message> - <location filename="../../copyEngineOptions.ui" line="35"/> + <location filename="../../copyEngineOptions.ui" line="44"/> <source>Transfer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="44"/> + <location filename="../../copyEngineOptions.ui" line="53"/> <source>Move the whole folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="51"/> + <location filename="../../copyEngineOptions.ui" line="60"/> <source>Transfer the file rights</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="61"/> + <location filename="../../copyEngineOptions.ui" line="70"/> <source>Keep the file date</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="74"/> + <location filename="../../copyEngineOptions.ui" line="83"/> <source>Autostart the transfer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="81"/> - <location filename="../../copyEngineOptions.ui" line="101"/> + <location filename="../../copyEngineOptions.ui" line="90"/> + <location filename="../../copyEngineOptions.ui" line="110"/> <source>Less performance if checked</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="104"/> + <location filename="../../copyEngineOptions.ui" line="113"/> <source>Follow the strict order</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="130"/> + <location filename="../../copyEngineOptions.ui" line="139"/> <source>Error and collision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="136"/> + <location filename="../../copyEngineOptions.ui" line="145"/> <source>When folder error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="146"/> + <location filename="../../copyEngineOptions.ui" line="155"/> <source>When file error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="172"/> + <location filename="../../copyEngineOptions.ui" line="181"/> <source>When file collision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="232"/> + <location filename="../../copyEngineOptions.ui" line="241"/> <source>When folder collision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="263"/> + <location filename="../../copyEngineOptions.ui" line="272"/> <source>Check if destination folder exists</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="270"/> + <location filename="../../copyEngineOptions.ui" line="279"/> <source>Renaming rules</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="290"/> + <location filename="../../copyEngineOptions.ui" line="299"/> <source>Delete partially transferred files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="303"/> + <location filename="../../copyEngineOptions.ui" line="312"/> <source>Rename the original destination</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="334"/> + <location filename="../../copyEngineOptions.ui" line="343"/> <source>Control</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="340"/> + <location filename="../../copyEngineOptions.ui" line="349"/> <source>Checksum</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="349"/> + <location filename="../../copyEngineOptions.ui" line="358"/> <source>Only after error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="356"/> + <location filename="../../copyEngineOptions.ui" line="365"/> <source>Ignore if impossible</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="373"/> + <location filename="../../copyEngineOptions.ui" line="382"/> <source>Verify checksums</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="405"/> + <location filename="../../copyEngineOptions.ui" line="414"/> <source>Performance</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="411"/> + <location filename="../../copyEngineOptions.ui" line="420"/> <source>Parallel buffer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="418"/> - <location filename="../../copyEngineOptions.ui" line="431"/> - <location filename="../../copyEngineOptions.ui" line="444"/> - <location filename="../../copyEngineOptions.ui" line="481"/> - <location filename="../../copyEngineOptions.ui" line="550"/> + <location filename="../../copyEngineOptions.ui" line="427"/> + <location filename="../../copyEngineOptions.ui" line="440"/> + <location filename="../../copyEngineOptions.ui" line="453"/> + <location filename="../../copyEngineOptions.ui" line="490"/> + <location filename="../../copyEngineOptions.ui" line="559"/> <source>KB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="460"/> + <location filename="../../copyEngineOptions.ui" line="469"/> <source>Block size</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="467"/> + <location filename="../../copyEngineOptions.ui" line="476"/> <source>Sequential buffer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="474"/> + <location filename="../../copyEngineOptions.ui" line="483"/> <source>Enable OS buffer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="497"/> + <location filename="../../copyEngineOptions.ui" line="506"/> <source>OS buffer only if smaller than</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="504"/> + <location filename="../../copyEngineOptions.ui" line="513"/> <source>Transfer algorithm</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="543"/> + <location filename="../../copyEngineOptions.ui" line="552"/> <source>Parallelize if smaller than</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="573"/> - <source>Inode threads</source> + <location filename="../../copyEngineOptions.ui" line="582"/> + <source>Inode threads (unsafe > 1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="580"/> - <location filename="../../copyEngineOptions.ui" line="590"/> + <location filename="../../copyEngineOptions.ui" line="589"/> + <location filename="../../copyEngineOptions.ui" line="599"/> <source>More cpu, but better organisation on the disk</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="593"/> + <location filename="../../copyEngineOptions.ui" line="602"/> <source>Order the list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="609"/> + <location filename="../../copyEngineOptions.ui" line="618"/> <source>Misc</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="615"/> + <location filename="../../copyEngineOptions.ui" line="624"/> <source>Check the disk space</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="625"/> + <location filename="../../copyEngineOptions.ui" line="634"/> <source>Use this folder when destination is not set</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="637"/> + <location filename="../../copyEngineOptions.ui" line="646"/> <source>Browse</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="659"/> + <location filename="../../copyEngineOptions.ui" line="668"/> <source>Filters</source> <translation type="unfinished"></translation> </message> diff --git a/plugins/CopyEngine/Ultracopier/Languages/en/translation.ts b/plugins/CopyEngine/Ultracopier/Languages/en/translation.ts index fec0f28..223e40a 100644 --- a/plugins/CopyEngine/Ultracopier/Languages/en/translation.ts +++ b/plugins/CopyEngine/Ultracopier/Languages/en/translation.ts @@ -146,85 +146,85 @@ <context> <name>CopyEngineFactory</name> <message> - <location filename="../../CopyEngineFactory.cpp" line="419"/> - <location filename="../../CopyEngineFactory.cpp" line="422"/> <location filename="../../CopyEngineFactory.cpp" line="427"/> - <location filename="../../CopyEngineFactory.cpp" line="431"/> + <location filename="../../CopyEngineFactory.cpp" line="430"/> + <location filename="../../CopyEngineFactory.cpp" line="435"/> + <location filename="../../CopyEngineFactory.cpp" line="439"/> <source>Ask</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="420"/> - <location filename="../../CopyEngineFactory.cpp" line="424"/> <location filename="../../CopyEngineFactory.cpp" line="428"/> <location filename="../../CopyEngineFactory.cpp" line="432"/> + <location filename="../../CopyEngineFactory.cpp" line="436"/> + <location filename="../../CopyEngineFactory.cpp" line="440"/> <source>Skip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="423"/> + <location filename="../../CopyEngineFactory.cpp" line="431"/> <source>Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="425"/> - <location filename="../../CopyEngineFactory.cpp" line="437"/> + <location filename="../../CopyEngineFactory.cpp" line="433"/> + <location filename="../../CopyEngineFactory.cpp" line="445"/> <source>Rename</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="429"/> + <location filename="../../CopyEngineFactory.cpp" line="437"/> <source>Put at the end</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="433"/> + <location filename="../../CopyEngineFactory.cpp" line="441"/> <source>Overwrite</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="434"/> + <location filename="../../CopyEngineFactory.cpp" line="442"/> <source>Overwrite if different</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="435"/> + <location filename="../../CopyEngineFactory.cpp" line="443"/> <source>Overwrite if newer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="436"/> + <location filename="../../CopyEngineFactory.cpp" line="444"/> <source>Overwrite if older</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="439"/> + <location filename="../../CopyEngineFactory.cpp" line="447"/> <source>Automatic</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="440"/> + <location filename="../../CopyEngineFactory.cpp" line="448"/> <source>Sequential</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="441"/> + <location filename="../../CopyEngineFactory.cpp" line="449"/> <source>Parallel</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="492"/> - <location filename="../../CopyEngineFactory.cpp" line="531"/> + <location filename="../../CopyEngineFactory.cpp" line="500"/> + <location filename="../../CopyEngineFactory.cpp" line="539"/> <source>Options error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="492"/> + <location filename="../../CopyEngineFactory.cpp" line="500"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="531"/> + <location filename="../../CopyEngineFactory.cpp" line="539"/> <source>Options engine is not loaded, can't access to the filters</source> <translation type="unfinished"></translation> </message> @@ -274,21 +274,21 @@ <name>FileExistsDialog</name> <message> <location filename="../../FileExistsDialog.cpp" line="137"/> - <source>%1 - copy</source> + <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="147"/> - <source>%1 - copy (%2)</source> + <location filename="../../FileExistsDialog.cpp" line="144"/> + <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="232"/> + <location filename="../../FileExistsDialog.cpp" line="228"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="232"/> + <location filename="../../FileExistsDialog.cpp" line="228"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -297,21 +297,21 @@ <name>FileIsSameDialog</name> <message> <location filename="../../FileIsSameDialog.cpp" line="111"/> - <source>%1 - copy</source> + <source>%name% - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="121"/> - <source>%1 - copy (%2)</source> + <location filename="../../FileIsSameDialog.cpp" line="118"/> + <source>%name% - copy (%number%)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="188"/> + <location filename="../../FileIsSameDialog.cpp" line="184"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="188"/> + <location filename="../../FileIsSameDialog.cpp" line="184"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -464,21 +464,21 @@ </message> <message> <location filename="../../FolderExistsDialog.cpp" line="122"/> - <source>%1 - copy</source> + <source>%name% - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="132"/> - <source>%1 - copy (%2)</source> + <location filename="../../FolderExistsDialog.cpp" line="131"/> + <source>%name% - copy (%number%)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="193"/> + <location filename="../../FolderExistsDialog.cpp" line="190"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="193"/> + <location filename="../../FolderExistsDialog.cpp" line="190"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -486,49 +486,49 @@ <context> <name>ListThread</name> <message> - <location filename="../../ListThread.cpp" line="1482"/> - <location filename="../../ListThread.cpp" line="2414"/> + <location filename="../../ListThread.cpp" line="1487"/> + <location filename="../../ListThread.cpp" line="2419"/> <source>Unable do to move or copy item into wrong forced mode: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1489"/> - <location filename="../../ListThread.cpp" line="2421"/> + <location filename="../../ListThread.cpp" line="1494"/> + <location filename="../../ListThread.cpp" line="2426"/> <source>Unable to save the transfer list: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1505"/> + <location filename="../../ListThread.cpp" line="1510"/> <source>Problem reading file, or file-size is 0</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1512"/> + <location filename="../../ListThread.cpp" line="1517"/> <source>Wrong header: "%1"</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1521"/> + <location filename="../../ListThread.cpp" line="1526"/> <source>The transfer list is in mixed mode, but this instance is not in this mode</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1530"/> + <location filename="../../ListThread.cpp" line="1535"/> <source>The transfer list is in copy mode, but this instance is not in this mode</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1536"/> + <location filename="../../ListThread.cpp" line="1541"/> <source>The transfer list is in move mode, but this instance is not in this mode</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1599"/> + <location filename="../../ListThread.cpp" line="1604"/> <source>Some errors have been found during the line parsing</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1607"/> + <location filename="../../ListThread.cpp" line="1612"/> <source>Unable to open the transfer list: %1</source> <translation type="unfinished"></translation> </message> @@ -570,24 +570,24 @@ <context> <name>ReadThread</name> <message> - <location filename="../../ReadThread.cpp" line="55"/> + <location filename="../../ReadThread.cpp" line="59"/> <source>Internal error, please report it!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ReadThread.cpp" line="184"/> + <location filename="../../ReadThread.cpp" line="188"/> <source>Internal error reading the source file:block size out of range</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ReadThread.cpp" line="192"/> - <location filename="../../ReadThread.cpp" line="408"/> + <location filename="../../ReadThread.cpp" line="196"/> + <location filename="../../ReadThread.cpp" line="420"/> <source>Unable to read the source file: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ReadThread.cpp" line="233"/> - <location filename="../../ReadThread.cpp" line="456"/> + <location filename="../../ReadThread.cpp" line="237"/> + <location filename="../../ReadThread.cpp" line="468"/> <source>File truncated during the read, possible data change</source> <translation type="unfinished"></translation> </message> @@ -600,37 +600,31 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../RenamingRules.ui" line="26"/> + <location filename="../../RenamingRules.ui" line="35"/> <source>First renaming</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../RenamingRules.ui" line="32"/> - <source>%name% - copy</source> + <location filename="../../RenamingRules.ui" line="41"/> + <source>%name% - copy%suffix%</source> <extracomment>%name% should not be translated</extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../../RenamingRules.ui" line="39"/> - <source><html><head/><body><p>Variables: <span style=" font-weight:600;">%name%</span> for the original file name</p></body></html></source> - <extracomment> should not be translated</extracomment> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../RenamingRules.ui" line="49"/> - <source>Second renaming</source> + <location filename="../../RenamingRules.ui" line="57"/> + <source>%name% - copy (%number%)%suffix%</source> + <extracomment>%name%, %number% should not be translated</extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../../RenamingRules.ui" line="55"/> - <source>%name% - copy (%number%)</source> + <location filename="../../RenamingRules.ui" line="67"/> + <source><html><head/><body><p>Variables: <span style=" font-weight:600;">%name%</span> for the original file name, <span style=" font-weight:600;">%number%</span> for the extra number, <span style=" font-weight:600;">%suffix%</span> file suffix</p></body></html></source> <extracomment>%name%, %number% should not be translated</extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../../RenamingRules.ui" line="62"/> - <source><html><head/><body><p>Variables: <span style=" font-weight:600;">%name%</span> for the original file name</p><p><span style=" font-weight:600;">%number%</span> for the extra number</p></body></html></source> - <extracomment>%name%, %number% should not be translated</extracomment> + <location filename="../../RenamingRules.ui" line="51"/> + <source>Second renaming</source> <translation type="unfinished"></translation> </message> <message> @@ -655,33 +649,41 @@ </message> <message> <location filename="../../ScanFileOrFolder.cpp" line="338"/> - <location filename="../../ScanFileOrFolder.cpp" line="404"/> <source>%1 - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="348"/> - <location filename="../../ScanFileOrFolder.cpp" line="414"/> + <location filename="../../ScanFileOrFolder.cpp" line="345"/> <source>%1 - copy (%2)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="452"/> + <location filename="../../ScanFileOrFolder.cpp" line="401"/> + <source>%name% - copy</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../ScanFileOrFolder.cpp" line="408"/> + <source>%name% - copy (%number%)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../ScanFileOrFolder.cpp" line="444"/> <source>This is not a folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="454"/> + <location filename="../../ScanFileOrFolder.cpp" line="446"/> <source>The folder does exists</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="456"/> + <location filename="../../ScanFileOrFolder.cpp" line="448"/> <source>The folder is not readable</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="467"/> + <location filename="../../ScanFileOrFolder.cpp" line="459"/> <source>Problem with name encoding</source> <translation type="unfinished"></translation> </message> @@ -690,9 +692,9 @@ <name>TransferThread</name> <message> <location filename="../../TransferThread.cpp" line="244"/> - <location filename="../../TransferThread.cpp" line="677"/> - <location filename="../../TransferThread.cpp" line="749"/> - <location filename="../../TransferThread.cpp" line="1319"/> + <location filename="../../TransferThread.cpp" line="673"/> + <location filename="../../TransferThread.cpp" line="745"/> + <location filename="../../TransferThread.cpp" line="1315"/> <source>File not found</source> <translation type="unfinished"></translation> </message> @@ -725,60 +727,60 @@ </message> <message> <location filename="../../TransferThread.cpp" line="645"/> - <source>%1 - copy</source> + <source>%name% - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="655"/> - <source>%1 - copy (%2)</source> + <location filename="../../TransferThread.cpp" line="652"/> + <source>%name% - copy (%number%)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="715"/> - <location filename="../../TransferThread.cpp" line="830"/> + <location filename="../../TransferThread.cpp" line="711"/> + <location filename="../../TransferThread.cpp" line="826"/> <source>The source file doesn't exist</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="755"/> - <location filename="../../TransferThread.cpp" line="842"/> + <location filename="../../TransferThread.cpp" line="751"/> + <location filename="../../TransferThread.cpp" line="838"/> <source>Unable to do the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="791"/> + <location filename="../../TransferThread.cpp" line="787"/> <source>The source doesn't exist</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="836"/> + <location filename="../../TransferThread.cpp" line="832"/> <source>Another file exists at same place</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1138"/> + <location filename="../../TransferThread.cpp" line="1134"/> <source>The checksums do not match</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1228"/> + <location filename="../../TransferThread.cpp" line="1224"/> <source>Internal error: The destination is not closed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1243"/> + <location filename="../../TransferThread.cpp" line="1239"/> <source>Internal error: The size transfered doesn't match</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1254"/> + <location filename="../../TransferThread.cpp" line="1250"/> <source>Internal error: The buffer is not empty</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1319"/> - <location filename="../../TransferThread.cpp" line="1337"/> - <location filename="../../TransferThread.cpp" line="1352"/> + <location filename="../../TransferThread.cpp" line="1315"/> + <location filename="../../TransferThread.cpp" line="1333"/> + <location filename="../../TransferThread.cpp" line="1348"/> <source>Unable to change the date</source> <translation type="unfinished"></translation> </message> @@ -791,22 +793,22 @@ <context> <name>WriteThread</name> <message> - <location filename="../../WriteThread.cpp" line="80"/> + <location filename="../../WriteThread.cpp" line="83"/> <source>Path resolution error (Empty path)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../WriteThread.cpp" line="269"/> + <location filename="../../WriteThread.cpp" line="277"/> <source>Internal error, please report it!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../WriteThread.cpp" line="672"/> + <location filename="../../WriteThread.cpp" line="680"/> <source>Unable to read the source file: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../WriteThread.cpp" line="697"/> + <location filename="../../WriteThread.cpp" line="705"/> <source>File truncated during read, possible data change</source> <translation type="unfinished"></translation> </message> @@ -814,198 +816,198 @@ <context> <name>copyEngineOptions</name> <message> - <location filename="../../copyEngineOptions.ui" line="35"/> + <location filename="../../copyEngineOptions.ui" line="44"/> <source>Transfer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="44"/> + <location filename="../../copyEngineOptions.ui" line="53"/> <source>Move the whole folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="51"/> + <location filename="../../copyEngineOptions.ui" line="60"/> <source>Transfer the file rights</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="61"/> + <location filename="../../copyEngineOptions.ui" line="70"/> <source>Keep the file date</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="74"/> + <location filename="../../copyEngineOptions.ui" line="83"/> <source>Autostart the transfer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="81"/> - <location filename="../../copyEngineOptions.ui" line="101"/> + <location filename="../../copyEngineOptions.ui" line="90"/> + <location filename="../../copyEngineOptions.ui" line="110"/> <source>Less performance if checked</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="104"/> + <location filename="../../copyEngineOptions.ui" line="113"/> <source>Follow the strict order</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="130"/> + <location filename="../../copyEngineOptions.ui" line="139"/> <source>Error and collision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="136"/> + <location filename="../../copyEngineOptions.ui" line="145"/> <source>When folder error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="146"/> + <location filename="../../copyEngineOptions.ui" line="155"/> <source>When file error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="172"/> + <location filename="../../copyEngineOptions.ui" line="181"/> <source>When file collision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="232"/> + <location filename="../../copyEngineOptions.ui" line="241"/> <source>When folder collision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="263"/> + <location filename="../../copyEngineOptions.ui" line="272"/> <source>Check if destination folder exists</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="270"/> + <location filename="../../copyEngineOptions.ui" line="279"/> <source>Renaming rules</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="290"/> + <location filename="../../copyEngineOptions.ui" line="299"/> <source>Delete partially transferred files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="303"/> + <location filename="../../copyEngineOptions.ui" line="312"/> <source>Rename the original destination</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="334"/> + <location filename="../../copyEngineOptions.ui" line="343"/> <source>Control</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="340"/> + <location filename="../../copyEngineOptions.ui" line="349"/> <source>Checksum</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="349"/> + <location filename="../../copyEngineOptions.ui" line="358"/> <source>Only after error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="356"/> + <location filename="../../copyEngineOptions.ui" line="365"/> <source>Ignore if impossible</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="373"/> + <location filename="../../copyEngineOptions.ui" line="382"/> <source>Verify checksums</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="405"/> + <location filename="../../copyEngineOptions.ui" line="414"/> <source>Performance</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="411"/> + <location filename="../../copyEngineOptions.ui" line="420"/> <source>Parallel buffer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="418"/> - <location filename="../../copyEngineOptions.ui" line="431"/> - <location filename="../../copyEngineOptions.ui" line="444"/> - <location filename="../../copyEngineOptions.ui" line="481"/> - <location filename="../../copyEngineOptions.ui" line="550"/> + <location filename="../../copyEngineOptions.ui" line="427"/> + <location filename="../../copyEngineOptions.ui" line="440"/> + <location filename="../../copyEngineOptions.ui" line="453"/> + <location filename="../../copyEngineOptions.ui" line="490"/> + <location filename="../../copyEngineOptions.ui" line="559"/> <source>KB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="460"/> + <location filename="../../copyEngineOptions.ui" line="469"/> <source>Block size</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="467"/> + <location filename="../../copyEngineOptions.ui" line="476"/> <source>Sequential buffer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="474"/> + <location filename="../../copyEngineOptions.ui" line="483"/> <source>Enable OS buffer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="497"/> + <location filename="../../copyEngineOptions.ui" line="506"/> <source>OS buffer only if smaller than</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="504"/> + <location filename="../../copyEngineOptions.ui" line="513"/> <source>Transfer algorithm</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="543"/> + <location filename="../../copyEngineOptions.ui" line="552"/> <source>Parallelize if smaller than</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="573"/> - <source>Inode threads</source> + <location filename="../../copyEngineOptions.ui" line="582"/> + <source>Inode threads (unsafe > 1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="580"/> - <location filename="../../copyEngineOptions.ui" line="590"/> + <location filename="../../copyEngineOptions.ui" line="589"/> + <location filename="../../copyEngineOptions.ui" line="599"/> <source>More cpu, but better organisation on the disk</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="593"/> + <location filename="../../copyEngineOptions.ui" line="602"/> <source>Order the list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="609"/> + <location filename="../../copyEngineOptions.ui" line="618"/> <source>Misc</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="615"/> + <location filename="../../copyEngineOptions.ui" line="624"/> <source>Check the disk space</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="625"/> + <location filename="../../copyEngineOptions.ui" line="634"/> <source>Use this folder when destination is not set</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="637"/> + <location filename="../../copyEngineOptions.ui" line="646"/> <source>Browse</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="659"/> + <location filename="../../copyEngineOptions.ui" line="668"/> <source>Filters</source> <translation type="unfinished"></translation> </message> diff --git a/plugins/CopyEngine/Ultracopier/Languages/es/translation.ts b/plugins/CopyEngine/Ultracopier/Languages/es/translation.ts index 5da0c8b..d69e5eb 100644 --- a/plugins/CopyEngine/Ultracopier/Languages/es/translation.ts +++ b/plugins/CopyEngine/Ultracopier/Languages/es/translation.ts @@ -146,85 +146,85 @@ <context> <name>CopyEngineFactory</name> <message> - <location filename="../../CopyEngineFactory.cpp" line="419"/> - <location filename="../../CopyEngineFactory.cpp" line="422"/> <location filename="../../CopyEngineFactory.cpp" line="427"/> - <location filename="../../CopyEngineFactory.cpp" line="431"/> + <location filename="../../CopyEngineFactory.cpp" line="430"/> + <location filename="../../CopyEngineFactory.cpp" line="435"/> + <location filename="../../CopyEngineFactory.cpp" line="439"/> <source>Ask</source> <translation>Pedir</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="420"/> - <location filename="../../CopyEngineFactory.cpp" line="424"/> <location filename="../../CopyEngineFactory.cpp" line="428"/> <location filename="../../CopyEngineFactory.cpp" line="432"/> + <location filename="../../CopyEngineFactory.cpp" line="436"/> + <location filename="../../CopyEngineFactory.cpp" line="440"/> <source>Skip</source> <translation>Omitir</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="423"/> + <location filename="../../CopyEngineFactory.cpp" line="431"/> <source>Merge</source> <translation>Unir</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="425"/> - <location filename="../../CopyEngineFactory.cpp" line="437"/> + <location filename="../../CopyEngineFactory.cpp" line="433"/> + <location filename="../../CopyEngineFactory.cpp" line="445"/> <source>Rename</source> <translation>Cambiar el nombre</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="429"/> + <location filename="../../CopyEngineFactory.cpp" line="437"/> <source>Put at the end</source> <translation>Ponga al final</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="433"/> + <location filename="../../CopyEngineFactory.cpp" line="441"/> <source>Overwrite</source> <translation>Sobrescribir</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="434"/> + <location filename="../../CopyEngineFactory.cpp" line="442"/> <source>Overwrite if different</source> <translation>Sobrescribir si es diferente</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="435"/> + <location filename="../../CopyEngineFactory.cpp" line="443"/> <source>Overwrite if newer</source> <translation>Sobrescribir si nuevo</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="436"/> + <location filename="../../CopyEngineFactory.cpp" line="444"/> <source>Overwrite if older</source> <translation>Sobrescribir si es mayor</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="439"/> + <location filename="../../CopyEngineFactory.cpp" line="447"/> <source>Automatic</source> <translation>Automático</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="440"/> + <location filename="../../CopyEngineFactory.cpp" line="448"/> <source>Sequential</source> <translation>Secuencial</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="441"/> + <location filename="../../CopyEngineFactory.cpp" line="449"/> <source>Parallel</source> <translation>Paralelo</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="492"/> - <location filename="../../CopyEngineFactory.cpp" line="531"/> + <location filename="../../CopyEngineFactory.cpp" line="500"/> + <location filename="../../CopyEngineFactory.cpp" line="539"/> <source>Options error</source> <translation>error Opciones</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="492"/> + <location filename="../../CopyEngineFactory.cpp" line="500"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation>Opciones del motor no está cargado. No es posible acceder a los filtros</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="531"/> + <location filename="../../CopyEngineFactory.cpp" line="539"/> <source>Options engine is not loaded, can't access to the filters</source> <translation>Opciones del motor no está cargado, no se puede acceder a los filtros</translation> </message> @@ -274,21 +274,21 @@ <name>FileExistsDialog</name> <message> <location filename="../../FileExistsDialog.cpp" line="137"/> - <source>%1 - copy</source> - <translation>%1 - copia</translation> + <source>%name% - copy%suffix%</source> + <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="147"/> - <source>%1 - copy (%2)</source> - <translation>%1 - copia (%2)</translation> + <location filename="../../FileExistsDialog.cpp" line="144"/> + <source>%name% - copy (%number%)%suffix%</source> + <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="232"/> + <location filename="../../FileExistsDialog.cpp" line="228"/> <source>Error</source> <translation>Error</translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="232"/> + <location filename="../../FileExistsDialog.cpp" line="228"/> <source>Try rename with using special characters</source> <translation>Trate de cambiar el nombre con el uso de caracteres especiales</translation> </message> @@ -297,21 +297,21 @@ <name>FileIsSameDialog</name> <message> <location filename="../../FileIsSameDialog.cpp" line="111"/> - <source>%1 - copy</source> - <translation>%1 - copia</translation> + <source>%name% - copy</source> + <translation type="unfinished">%name% - copia</translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="121"/> - <source>%1 - copy (%2)</source> - <translation>%1 - copia (%2)</translation> + <location filename="../../FileIsSameDialog.cpp" line="118"/> + <source>%name% - copy (%number%)</source> + <translation type="unfinished">%name% - copia (%number%)</translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="188"/> + <location filename="../../FileIsSameDialog.cpp" line="184"/> <source>Error</source> <translation>Error</translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="188"/> + <location filename="../../FileIsSameDialog.cpp" line="184"/> <source>Try rename with using special characters</source> <translation>Trate de cambiar el nombre con el uso de caracteres especiales</translation> </message> @@ -464,21 +464,21 @@ </message> <message> <location filename="../../FolderExistsDialog.cpp" line="122"/> - <source>%1 - copy</source> - <translation>%1 - copia</translation> + <source>%name% - copy</source> + <translation type="unfinished">%name% - copia</translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="132"/> - <source>%1 - copy (%2)</source> - <translation>%1 - copia (%2)</translation> + <location filename="../../FolderExistsDialog.cpp" line="131"/> + <source>%name% - copy (%number%)</source> + <translation type="unfinished">%name% - copia (%number%)</translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="193"/> + <location filename="../../FolderExistsDialog.cpp" line="190"/> <source>Error</source> <translation>Error</translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="193"/> + <location filename="../../FolderExistsDialog.cpp" line="190"/> <source>Try rename with using special characters</source> <translation>Trate de cambiar el nombre con el uso de caracteres especiales</translation> </message> @@ -486,49 +486,49 @@ <context> <name>ListThread</name> <message> - <location filename="../../ListThread.cpp" line="1482"/> - <location filename="../../ListThread.cpp" line="2414"/> + <location filename="../../ListThread.cpp" line="1487"/> + <location filename="../../ListThread.cpp" line="2419"/> <source>Unable do to move or copy item into wrong forced mode: %1</source> <translation>No se puede hacer para mover o copiar elemento en modo incorrecto obligado: %1</translation> </message> <message> - <location filename="../../ListThread.cpp" line="1489"/> - <location filename="../../ListThread.cpp" line="2421"/> + <location filename="../../ListThread.cpp" line="1494"/> + <location filename="../../ListThread.cpp" line="2426"/> <source>Unable to save the transfer list: %1</source> <translation>No se puede guardar la lista de transferencias: %1</translation> </message> <message> - <location filename="../../ListThread.cpp" line="1505"/> + <location filename="../../ListThread.cpp" line="1510"/> <source>Problem reading file, or file-size is 0</source> <translation>Problema al leer el archivo o archivos de tamaño es 0</translation> </message> <message> - <location filename="../../ListThread.cpp" line="1512"/> + <location filename="../../ListThread.cpp" line="1517"/> <source>Wrong header: "%1"</source> <translation>Encabezado incorrecto: "%1"</translation> </message> <message> - <location filename="../../ListThread.cpp" line="1521"/> + <location filename="../../ListThread.cpp" line="1526"/> <source>The transfer list is in mixed mode, but this instance is not in this mode</source> <translation>La lista de transferencia está en modo mixto, pero este caso no es de este modo</translation> </message> <message> - <location filename="../../ListThread.cpp" line="1530"/> + <location filename="../../ListThread.cpp" line="1535"/> <source>The transfer list is in copy mode, but this instance is not in this mode</source> <translation>La lista de transferencia está en el modo de copia, pero esta instancia no está en este modo</translation> </message> <message> - <location filename="../../ListThread.cpp" line="1536"/> + <location filename="../../ListThread.cpp" line="1541"/> <source>The transfer list is in move mode, but this instance is not in this mode</source> <translation>La lista de transferencia es el modo de desplazamiento, pero esta instancia no está en este modo</translation> </message> <message> - <location filename="../../ListThread.cpp" line="1599"/> + <location filename="../../ListThread.cpp" line="1604"/> <source>Some errors have been found during the line parsing</source> <translation>Algunos errores han sido encontrados durante el análisis de línea</translation> </message> <message> - <location filename="../../ListThread.cpp" line="1607"/> + <location filename="../../ListThread.cpp" line="1612"/> <source>Unable to open the transfer list: %1</source> <translation>No se puede abrir la lista de transferencias: %1</translation> </message> @@ -570,24 +570,24 @@ <context> <name>ReadThread</name> <message> - <location filename="../../ReadThread.cpp" line="55"/> + <location filename="../../ReadThread.cpp" line="59"/> <source>Internal error, please report it!</source> <translation>Error interno, por favor informe de ello!</translation> </message> <message> - <location filename="../../ReadThread.cpp" line="184"/> + <location filename="../../ReadThread.cpp" line="188"/> <source>Internal error reading the source file:block size out of range</source> <translation>Error interno de leer el archivo de origen: tamaño de bloque fuera de rango</translation> </message> <message> - <location filename="../../ReadThread.cpp" line="192"/> - <location filename="../../ReadThread.cpp" line="408"/> + <location filename="../../ReadThread.cpp" line="196"/> + <location filename="../../ReadThread.cpp" line="420"/> <source>Unable to read the source file: </source> <translation>No se puede leer el archivo de origen: </translation> </message> <message> - <location filename="../../ReadThread.cpp" line="233"/> - <location filename="../../ReadThread.cpp" line="456"/> + <location filename="../../ReadThread.cpp" line="237"/> + <location filename="../../ReadThread.cpp" line="468"/> <source>File truncated during the read, possible data change</source> <translation>Archivo truncada durante el cambio de lectura, los datos posibles</translation> </message> @@ -595,38 +595,32 @@ <context> <name>RenamingRules</name> <message> - <location filename="../../RenamingRules.ui" line="26"/> + <location filename="../../RenamingRules.ui" line="35"/> <source>First renaming</source> <translation>En primer lugar el cambio de nombre</translation> </message> <message> - <location filename="../../RenamingRules.ui" line="32"/> - <source>%name% - copy</source> + <location filename="../../RenamingRules.ui" line="41"/> + <source>%name% - copy%suffix%</source> <extracomment>%name% should not be translated</extracomment> - <translation>%name% - copia</translation> - </message> - <message> - <location filename="../../RenamingRules.ui" line="39"/> - <source><html><head/><body><p>Variables: <span style=" font-weight:600;">%name%</span> for the original file name</p></body></html></source> - <extracomment> should not be translated</extracomment> - <translation><html><head/><body><p>Variables: <span style=" font-weight:600;">%name%</span> para el nombre del archivo original</p></body></html></translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="../../RenamingRules.ui" line="49"/> - <source>Second renaming</source> - <translation>En segundo lugar el cambio de nombre</translation> + <location filename="../../RenamingRules.ui" line="57"/> + <source>%name% - copy (%number%)%suffix%</source> + <extracomment>%name%, %number% should not be translated</extracomment> + <translation type="unfinished"></translation> </message> <message> - <location filename="../../RenamingRules.ui" line="55"/> - <source>%name% - copy (%number%)</source> + <location filename="../../RenamingRules.ui" line="67"/> + <source><html><head/><body><p>Variables: <span style=" font-weight:600;">%name%</span> for the original file name, <span style=" font-weight:600;">%number%</span> for the extra number, <span style=" font-weight:600;">%suffix%</span> file suffix</p></body></html></source> <extracomment>%name%, %number% should not be translated</extracomment> - <translation>%name% - copia (%number%)</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="../../RenamingRules.ui" line="62"/> - <source><html><head/><body><p>Variables: <span style=" font-weight:600;">%name%</span> for the original file name</p><p><span style=" font-weight:600;">%number%</span> for the extra number</p></body></html></source> - <extracomment>%name%, %number% should not be translated</extracomment> - <translation><html><head/><body><p>Variables: <span style=" font-weight:600;">%name%</span> para el nombre del archivo original</p><p><span style=" font-weight:600;">%number%</span> para el número adicional</p></body></html></translation> + <location filename="../../RenamingRules.ui" line="51"/> + <source>Second renaming</source> + <translation>En segundo lugar el cambio de nombre</translation> </message> <message> <location filename="../../RenamingRules.cpp" line="39"/> @@ -655,33 +649,41 @@ </message> <message> <location filename="../../ScanFileOrFolder.cpp" line="338"/> - <location filename="../../ScanFileOrFolder.cpp" line="404"/> <source>%1 - copy</source> <translation>%1 - copia</translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="348"/> - <location filename="../../ScanFileOrFolder.cpp" line="414"/> + <location filename="../../ScanFileOrFolder.cpp" line="345"/> <source>%1 - copy (%2)</source> <translation>%1 - copia (%2)</translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="452"/> + <location filename="../../ScanFileOrFolder.cpp" line="401"/> + <source>%name% - copy</source> + <translation type="unfinished">%name% - copia</translation> + </message> + <message> + <location filename="../../ScanFileOrFolder.cpp" line="408"/> + <source>%name% - copy (%number%)</source> + <translation type="unfinished">%name% - copia (%number%)</translation> + </message> + <message> + <location filename="../../ScanFileOrFolder.cpp" line="444"/> <source>This is not a folder</source> <translation>Esto no es una carpeta</translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="454"/> + <location filename="../../ScanFileOrFolder.cpp" line="446"/> <source>The folder does exists</source> <translation>La carpeta no existe</translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="456"/> + <location filename="../../ScanFileOrFolder.cpp" line="448"/> <source>The folder is not readable</source> <translation>La carpeta no se puede leer</translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="467"/> + <location filename="../../ScanFileOrFolder.cpp" line="459"/> <source>Problem with name encoding</source> <translation>Problema con codificación de nombres</translation> </message> @@ -690,9 +692,9 @@ <name>TransferThread</name> <message> <location filename="../../TransferThread.cpp" line="244"/> - <location filename="../../TransferThread.cpp" line="677"/> - <location filename="../../TransferThread.cpp" line="749"/> - <location filename="../../TransferThread.cpp" line="1319"/> + <location filename="../../TransferThread.cpp" line="673"/> + <location filename="../../TransferThread.cpp" line="745"/> + <location filename="../../TransferThread.cpp" line="1315"/> <source>File not found</source> <translation>Archivo no encontrado</translation> </message> @@ -724,46 +726,36 @@ <translation type="unfinished">raíz</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="645"/> - <source>%1 - copy</source> - <translation type="unfinished">%1 - copia</translation> - </message> - <message> - <location filename="../../TransferThread.cpp" line="655"/> - <source>%1 - copy (%2)</source> - <translation type="unfinished">%1 - copia (%2)</translation> - </message> - <message> - <location filename="../../TransferThread.cpp" line="791"/> + <location filename="../../TransferThread.cpp" line="787"/> <source>The source doesn't exist</source> <translation type="unfinished">La fuente no existe</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1319"/> - <location filename="../../TransferThread.cpp" line="1337"/> - <location filename="../../TransferThread.cpp" line="1352"/> + <location filename="../../TransferThread.cpp" line="1315"/> + <location filename="../../TransferThread.cpp" line="1333"/> + <location filename="../../TransferThread.cpp" line="1348"/> <source>Unable to change the date</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="715"/> - <location filename="../../TransferThread.cpp" line="830"/> + <location filename="../../TransferThread.cpp" line="711"/> + <location filename="../../TransferThread.cpp" line="826"/> <source>The source file doesn't exist</source> <translation type="unfinished">El archivo de origen no existe</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1138"/> + <location filename="../../TransferThread.cpp" line="1134"/> <source>The checksums do not match</source> <translation type="unfinished">Las sumas de comprobación no coinciden</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1243"/> + <location filename="../../TransferThread.cpp" line="1239"/> <source>Internal error: The size transfered doesn't match</source> <translation type="unfinished">Error interno: El tamaño transferido no coincide</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="755"/> - <location filename="../../TransferThread.cpp" line="842"/> + <location filename="../../TransferThread.cpp" line="751"/> + <location filename="../../TransferThread.cpp" line="838"/> <source>Unable to do the folder</source> <translation type="unfinished">Incapaz de hacer la carpeta</translation> </message> @@ -773,17 +765,27 @@ <translation>Trate de cambiar el nombre con el uso de caracteres especiales</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="836"/> + <location filename="../../TransferThread.cpp" line="645"/> + <source>%name% - copy</source> + <translation type="unfinished">%name% - copia</translation> + </message> + <message> + <location filename="../../TransferThread.cpp" line="652"/> + <source>%name% - copy (%number%)</source> + <translation type="unfinished">%name% - copia (%number%)</translation> + </message> + <message> + <location filename="../../TransferThread.cpp" line="832"/> <source>Another file exists at same place</source> <translation type="unfinished">Otro archivo existe en el mismo lugar</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1228"/> + <location filename="../../TransferThread.cpp" line="1224"/> <source>Internal error: The destination is not closed</source> <translation type="unfinished">Error interno: El destino no está cerrado</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1254"/> + <location filename="../../TransferThread.cpp" line="1250"/> <source>Internal error: The buffer is not empty</source> <translation type="unfinished">Error interno: El buffer no está vacío</translation> </message> @@ -791,22 +793,22 @@ <context> <name>WriteThread</name> <message> - <location filename="../../WriteThread.cpp" line="80"/> + <location filename="../../WriteThread.cpp" line="83"/> <source>Path resolution error (Empty path)</source> <translation>Error de resolución de ruta (camino vacío)</translation> </message> <message> - <location filename="../../WriteThread.cpp" line="269"/> + <location filename="../../WriteThread.cpp" line="277"/> <source>Internal error, please report it!</source> <translation>Error interno, por favor informe de ello!</translation> </message> <message> - <location filename="../../WriteThread.cpp" line="672"/> + <location filename="../../WriteThread.cpp" line="680"/> <source>Unable to read the source file: </source> <translation>No se puede leer el archivo de origen: </translation> </message> <message> - <location filename="../../WriteThread.cpp" line="697"/> + <location filename="../../WriteThread.cpp" line="705"/> <source>File truncated during read, possible data change</source> <translation>Archivo truncado durante lectura, posible cambio de datos</translation> </message> @@ -814,198 +816,198 @@ <context> <name>copyEngineOptions</name> <message> - <location filename="../../copyEngineOptions.ui" line="35"/> + <location filename="../../copyEngineOptions.ui" line="44"/> <source>Transfer</source> <translation>Transferencia</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="44"/> + <location filename="../../copyEngineOptions.ui" line="53"/> <source>Move the whole folder</source> <translation>Mueva la carpeta completa</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="51"/> + <location filename="../../copyEngineOptions.ui" line="60"/> <source>Transfer the file rights</source> <translation>Transferencia de los derechos de archivo</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="61"/> + <location filename="../../copyEngineOptions.ui" line="70"/> <source>Keep the file date</source> <translation>Mantener la fecha de archivo</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="74"/> + <location filename="../../copyEngineOptions.ui" line="83"/> <source>Autostart the transfer</source> <translation>Inicio automático de la transferencia</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="81"/> - <location filename="../../copyEngineOptions.ui" line="101"/> + <location filename="../../copyEngineOptions.ui" line="90"/> + <location filename="../../copyEngineOptions.ui" line="110"/> <source>Less performance if checked</source> <translation>Si comprueba Menos rendimiento</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="104"/> + <location filename="../../copyEngineOptions.ui" line="113"/> <source>Follow the strict order</source> <translation>Siga el orden estricto</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="130"/> + <location filename="../../copyEngineOptions.ui" line="139"/> <source>Error and collision</source> <translation>Error y de la colisión</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="136"/> + <location filename="../../copyEngineOptions.ui" line="145"/> <source>When folder error</source> <translation>Cuando el error carpeta</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="146"/> + <location filename="../../copyEngineOptions.ui" line="155"/> <source>When file error</source> <translation>Cuando archivo error</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="172"/> + <location filename="../../copyEngineOptions.ui" line="181"/> <source>When file collision</source> <translation>Cuando archivo colisión</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="232"/> + <location filename="../../copyEngineOptions.ui" line="241"/> <source>When folder collision</source> <translation>Cuando la colisión carpeta</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="263"/> + <location filename="../../copyEngineOptions.ui" line="272"/> <source>Check if destination folder exists</source> <translation>Compruebe si existe la carpeta de destino</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="270"/> + <location filename="../../copyEngineOptions.ui" line="279"/> <source>Renaming rules</source> <translation>Reglas de Cambio de nombre</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="290"/> + <location filename="../../copyEngineOptions.ui" line="299"/> <source>Delete partially transferred files</source> <translation>Eliminar archivos parcialmente transferidos</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="303"/> + <location filename="../../copyEngineOptions.ui" line="312"/> <source>Rename the original destination</source> <translation>Cambie el nombre del destino original</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="334"/> + <location filename="../../copyEngineOptions.ui" line="343"/> <source>Control</source> <translation>Controlar</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="340"/> + <location filename="../../copyEngineOptions.ui" line="349"/> <source>Checksum</source> <translation>Suma de comprobación</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="349"/> + <location filename="../../copyEngineOptions.ui" line="358"/> <source>Only after error</source> <translation>Sólo después de un error</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="356"/> + <location filename="../../copyEngineOptions.ui" line="365"/> <source>Ignore if impossible</source> <translation>No haga caso si no es posible</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="373"/> + <location filename="../../copyEngineOptions.ui" line="382"/> <source>Verify checksums</source> <translation>Verifique checksums</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="405"/> + <location filename="../../copyEngineOptions.ui" line="414"/> <source>Performance</source> <translation>Rendimiento</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="411"/> + <location filename="../../copyEngineOptions.ui" line="420"/> <source>Parallel buffer</source> <translation>Búfer paralelo</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="418"/> - <location filename="../../copyEngineOptions.ui" line="431"/> - <location filename="../../copyEngineOptions.ui" line="444"/> - <location filename="../../copyEngineOptions.ui" line="481"/> - <location filename="../../copyEngineOptions.ui" line="550"/> + <location filename="../../copyEngineOptions.ui" line="427"/> + <location filename="../../copyEngineOptions.ui" line="440"/> + <location filename="../../copyEngineOptions.ui" line="453"/> + <location filename="../../copyEngineOptions.ui" line="490"/> + <location filename="../../copyEngineOptions.ui" line="559"/> <source>KB</source> <translation>KB</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="460"/> + <location filename="../../copyEngineOptions.ui" line="469"/> <source>Block size</source> <translation>Tamaño del bloque</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="467"/> + <location filename="../../copyEngineOptions.ui" line="476"/> <source>Sequential buffer</source> <translation>Tampón secuencial</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="474"/> + <location filename="../../copyEngineOptions.ui" line="483"/> <source>Enable OS buffer</source> <translation>Habilitar el OS de amortiguación</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="497"/> + <location filename="../../copyEngineOptions.ui" line="506"/> <source>OS buffer only if smaller than</source> <translation>OS de amortiguación sólo si menor que</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="504"/> + <location filename="../../copyEngineOptions.ui" line="513"/> <source>Transfer algorithm</source> <translation>Algoritmo de transferencia</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="543"/> + <location filename="../../copyEngineOptions.ui" line="552"/> <source>Parallelize if smaller than</source> <translation>Paralelice si más pequeño que</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="573"/> - <source>Inode threads</source> - <translation>Temas inodo</translation> + <location filename="../../copyEngineOptions.ui" line="582"/> + <source>Inode threads (unsafe > 1)</source> + <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="580"/> - <location filename="../../copyEngineOptions.ui" line="590"/> + <location filename="../../copyEngineOptions.ui" line="589"/> + <location filename="../../copyEngineOptions.ui" line="599"/> <source>More cpu, but better organisation on the disk</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="593"/> + <location filename="../../copyEngineOptions.ui" line="602"/> <source>Order the list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="609"/> + <location filename="../../copyEngineOptions.ui" line="618"/> <source>Misc</source> <translation>Misc</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="615"/> + <location filename="../../copyEngineOptions.ui" line="624"/> <source>Check the disk space</source> <translation>Compruebe el espacio en disco</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="625"/> + <location filename="../../copyEngineOptions.ui" line="634"/> <source>Use this folder when destination is not set</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="637"/> + <location filename="../../copyEngineOptions.ui" line="646"/> <source>Browse</source> <translation>Busque</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="659"/> + <location filename="../../copyEngineOptions.ui" line="668"/> <source>Filters</source> <translation>Filtros</translation> </message> diff --git a/plugins/CopyEngine/Ultracopier/Languages/fr/translation.ts b/plugins/CopyEngine/Ultracopier/Languages/fr/translation.ts index 3cd05c0..1eeef1b 100644 --- a/plugins/CopyEngine/Ultracopier/Languages/fr/translation.ts +++ b/plugins/CopyEngine/Ultracopier/Languages/fr/translation.ts @@ -146,85 +146,85 @@ <context> <name>CopyEngineFactory</name> <message> - <location filename="../../CopyEngineFactory.cpp" line="419"/> - <location filename="../../CopyEngineFactory.cpp" line="422"/> <location filename="../../CopyEngineFactory.cpp" line="427"/> - <location filename="../../CopyEngineFactory.cpp" line="431"/> + <location filename="../../CopyEngineFactory.cpp" line="430"/> + <location filename="../../CopyEngineFactory.cpp" line="435"/> + <location filename="../../CopyEngineFactory.cpp" line="439"/> <source>Ask</source> <translation>Demander</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="420"/> - <location filename="../../CopyEngineFactory.cpp" line="424"/> <location filename="../../CopyEngineFactory.cpp" line="428"/> <location filename="../../CopyEngineFactory.cpp" line="432"/> + <location filename="../../CopyEngineFactory.cpp" line="436"/> + <location filename="../../CopyEngineFactory.cpp" line="440"/> <source>Skip</source> <translation>Passer</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="423"/> + <location filename="../../CopyEngineFactory.cpp" line="431"/> <source>Merge</source> <translation>Fusionner</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="425"/> - <location filename="../../CopyEngineFactory.cpp" line="437"/> + <location filename="../../CopyEngineFactory.cpp" line="433"/> + <location filename="../../CopyEngineFactory.cpp" line="445"/> <source>Rename</source> <translation>Renommer</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="429"/> + <location filename="../../CopyEngineFactory.cpp" line="437"/> <source>Put at the end</source> <translation>Mettre à la fin</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="433"/> + <location filename="../../CopyEngineFactory.cpp" line="441"/> <source>Overwrite</source> <translation>Écraser</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="434"/> + <location filename="../../CopyEngineFactory.cpp" line="442"/> <source>Overwrite if different</source> <translation>Écraser si différent</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="435"/> + <location filename="../../CopyEngineFactory.cpp" line="443"/> <source>Overwrite if newer</source> <translation>Écraser si plus récent</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="436"/> + <location filename="../../CopyEngineFactory.cpp" line="444"/> <source>Overwrite if older</source> <translation>Écraser si plus vieux</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="439"/> + <location filename="../../CopyEngineFactory.cpp" line="447"/> <source>Automatic</source> <translation>Automatique</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="440"/> + <location filename="../../CopyEngineFactory.cpp" line="448"/> <source>Sequential</source> <translation>Séquentiel</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="441"/> + <location filename="../../CopyEngineFactory.cpp" line="449"/> <source>Parallel</source> <translation>Parallèle</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="492"/> - <location filename="../../CopyEngineFactory.cpp" line="531"/> + <location filename="../../CopyEngineFactory.cpp" line="500"/> + <location filename="../../CopyEngineFactory.cpp" line="539"/> <source>Options error</source> <translation>Erreur d'options</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="492"/> + <location filename="../../CopyEngineFactory.cpp" line="500"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation>Le moteur d'options n'est pas chargé. Impossible d'accédé aux filtres</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="531"/> + <location filename="../../CopyEngineFactory.cpp" line="539"/> <source>Options engine is not loaded, can't access to the filters</source> <translation>Moteur d'options non chargé, impossible d'accéder aux filtres</translation> </message> @@ -274,21 +274,21 @@ <name>FileExistsDialog</name> <message> <location filename="../../FileExistsDialog.cpp" line="137"/> - <source>%1 - copy</source> - <translation>%1 - copie</translation> + <source>%name% - copy%suffix%</source> + <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="147"/> - <source>%1 - copy (%2)</source> - <translation>%1 - copie (%2)</translation> + <location filename="../../FileExistsDialog.cpp" line="144"/> + <source>%name% - copy (%number%)%suffix%</source> + <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="232"/> + <location filename="../../FileExistsDialog.cpp" line="228"/> <source>Error</source> <translation>Erreur</translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="232"/> + <location filename="../../FileExistsDialog.cpp" line="228"/> <source>Try rename with using special characters</source> <translation>Essaie de renommage avec caratéres interdits</translation> </message> @@ -297,21 +297,21 @@ <name>FileIsSameDialog</name> <message> <location filename="../../FileIsSameDialog.cpp" line="111"/> - <source>%1 - copy</source> - <translation>%1 - copie</translation> + <source>%name% - copy</source> + <translation type="unfinished">%name% - copie</translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="121"/> - <source>%1 - copy (%2)</source> - <translation>%1 - copie (%2)</translation> + <location filename="../../FileIsSameDialog.cpp" line="118"/> + <source>%name% - copy (%number%)</source> + <translation type="unfinished">%name% - copie (%number%)</translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="188"/> + <location filename="../../FileIsSameDialog.cpp" line="184"/> <source>Error</source> <translation>Erreur</translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="188"/> + <location filename="../../FileIsSameDialog.cpp" line="184"/> <source>Try rename with using special characters</source> <translation>Essaie de renommage avec caratéres interdits</translation> </message> @@ -464,21 +464,21 @@ </message> <message> <location filename="../../FolderExistsDialog.cpp" line="122"/> - <source>%1 - copy</source> - <translation>%1 - copie</translation> + <source>%name% - copy</source> + <translation type="unfinished">%name% - copie</translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="132"/> - <source>%1 - copy (%2)</source> - <translation>%1 - copie (%2)</translation> + <location filename="../../FolderExistsDialog.cpp" line="131"/> + <source>%name% - copy (%number%)</source> + <translation type="unfinished">%name% - copie (%number%)</translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="193"/> + <location filename="../../FolderExistsDialog.cpp" line="190"/> <source>Error</source> <translation>Erreur</translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="193"/> + <location filename="../../FolderExistsDialog.cpp" line="190"/> <source>Try rename with using special characters</source> <translation>Essaie de renommage avec caratéres interdits</translation> </message> @@ -486,49 +486,49 @@ <context> <name>ListThread</name> <message> - <location filename="../../ListThread.cpp" line="1482"/> - <location filename="../../ListThread.cpp" line="2414"/> + <location filename="../../ListThread.cpp" line="1487"/> + <location filename="../../ListThread.cpp" line="2419"/> <source>Unable do to move or copy item into wrong forced mode: %1</source> <translation>Impossible de faire un déplacement ou une copie dans le mauvais mode forcé: %1</translation> </message> <message> - <location filename="../../ListThread.cpp" line="1489"/> - <location filename="../../ListThread.cpp" line="2421"/> + <location filename="../../ListThread.cpp" line="1494"/> + <location filename="../../ListThread.cpp" line="2426"/> <source>Unable to save the transfer list: %1</source> <translation>Impossible de sauvegarder la liste de transfert: %1</translation> </message> <message> - <location filename="../../ListThread.cpp" line="1505"/> + <location filename="../../ListThread.cpp" line="1510"/> <source>Problem reading file, or file-size is 0</source> <translation>Problem durant la lecture, ou taille de fichier est 0</translation> </message> <message> - <location filename="../../ListThread.cpp" line="1512"/> + <location filename="../../ListThread.cpp" line="1517"/> <source>Wrong header: "%1"</source> <translation>Mauvais en-tête: "%1"</translation> </message> <message> - <location filename="../../ListThread.cpp" line="1521"/> + <location filename="../../ListThread.cpp" line="1526"/> <source>The transfer list is in mixed mode, but this instance is not in this mode</source> <translation>La liste de transfert est en mode mixte, mais l'instance n'est pas dans ce mode</translation> </message> <message> - <location filename="../../ListThread.cpp" line="1530"/> + <location filename="../../ListThread.cpp" line="1535"/> <source>The transfer list is in copy mode, but this instance is not in this mode</source> <translation>La liste de transfert est en mode copie, mais l'instance n'est pas dans ce mode</translation> </message> <message> - <location filename="../../ListThread.cpp" line="1536"/> + <location filename="../../ListThread.cpp" line="1541"/> <source>The transfer list is in move mode, but this instance is not in this mode</source> <translation>La liste de transfert est en mode déplacement, mais l'instance n'est pas dans ce mode</translation> </message> <message> - <location filename="../../ListThread.cpp" line="1599"/> + <location filename="../../ListThread.cpp" line="1604"/> <source>Some errors have been found during the line parsing</source> <translation>Certaine erreur ont été trouvé durant l'analise de la line</translation> </message> <message> - <location filename="../../ListThread.cpp" line="1607"/> + <location filename="../../ListThread.cpp" line="1612"/> <source>Unable to open the transfer list: %1</source> <translation>Impossible d'ouvrir la list de transfert: %1</translation> </message> @@ -570,24 +570,24 @@ <context> <name>ReadThread</name> <message> - <location filename="../../ReadThread.cpp" line="55"/> + <location filename="../../ReadThread.cpp" line="59"/> <source>Internal error, please report it!</source> <translation>Erreur interne, merci de la reporter!</translation> </message> <message> - <location filename="../../ReadThread.cpp" line="184"/> + <location filename="../../ReadThread.cpp" line="188"/> <source>Internal error reading the source file:block size out of range</source> <translation>Erreur interne lisant le fichier source: taille de block hors de la plage</translation> </message> <message> - <location filename="../../ReadThread.cpp" line="192"/> - <location filename="../../ReadThread.cpp" line="408"/> + <location filename="../../ReadThread.cpp" line="196"/> + <location filename="../../ReadThread.cpp" line="420"/> <source>Unable to read the source file: </source> <translation>Impossible de lire le fichier source: </translation> </message> <message> - <location filename="../../ReadThread.cpp" line="233"/> - <location filename="../../ReadThread.cpp" line="456"/> + <location filename="../../ReadThread.cpp" line="237"/> + <location filename="../../ReadThread.cpp" line="468"/> <source>File truncated during the read, possible data change</source> <translatorcomment>La taille du fichier a diminué durant -> changé le texte original</translatorcomment> <translation>Fichier a diminué durant la lecture, possible changement de données</translation> @@ -596,42 +596,32 @@ <context> <name>RenamingRules</name> <message> - <location filename="../../RenamingRules.ui" line="26"/> + <location filename="../../RenamingRules.ui" line="35"/> <source>First renaming</source> <translation>Premier renommage</translation> </message> <message> - <location filename="../../RenamingRules.ui" line="32"/> - <source>%name% - copy</source> + <location filename="../../RenamingRules.ui" line="41"/> + <source>%name% - copy%suffix%</source> <extracomment>%name% should not be translated</extracomment> - <translatorcomment>variables need never be translated</translatorcomment> - <translation>%name% - copie</translation> - </message> - <message> - <location filename="../../RenamingRules.ui" line="39"/> - <source><html><head/><body><p>Variables: <span style=" font-weight:600;">%name%</span> for the original file name</p></body></html></source> - <extracomment> should not be translated</extracomment> - <translatorcomment>variables need never be translated</translatorcomment> - <translation><html><head/><body><p>Variables: <span style=" font-weight:600;">%name%</span> pour le nom originel</p></body></html></translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="../../RenamingRules.ui" line="49"/> - <source>Second renaming</source> - <translation>Second renommage</translation> + <location filename="../../RenamingRules.ui" line="57"/> + <source>%name% - copy (%number%)%suffix%</source> + <extracomment>%name%, %number% should not be translated</extracomment> + <translation type="unfinished"></translation> </message> <message> - <location filename="../../RenamingRules.ui" line="55"/> - <source>%name% - copy (%number%)</source> + <location filename="../../RenamingRules.ui" line="67"/> + <source><html><head/><body><p>Variables: <span style=" font-weight:600;">%name%</span> for the original file name, <span style=" font-weight:600;">%number%</span> for the extra number, <span style=" font-weight:600;">%suffix%</span> file suffix</p></body></html></source> <extracomment>%name%, %number% should not be translated</extracomment> - <translatorcomment>variables need never be translated</translatorcomment> - <translation>%name% - copie (%number%)</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="../../RenamingRules.ui" line="62"/> - <source><html><head/><body><p>Variables: <span style=" font-weight:600;">%name%</span> for the original file name</p><p><span style=" font-weight:600;">%number%</span> for the extra number</p></body></html></source> - <extracomment>%name%, %number% should not be translated</extracomment> - <translatorcomment>variables need never be translated</translatorcomment> - <translation><html><head/><body><p>Variables: <span style=" font-weight:600;">%name%</span> pour le nom originel</p><p><span style=" font-weight:600;">%number%</span> pour le nombre extra</p></body></html></translation> + <location filename="../../RenamingRules.ui" line="51"/> + <source>Second renaming</source> + <translation>Second renommage</translation> </message> <message> <location filename="../../RenamingRules.cpp" line="39"/> @@ -660,33 +650,41 @@ </message> <message> <location filename="../../ScanFileOrFolder.cpp" line="338"/> - <location filename="../../ScanFileOrFolder.cpp" line="404"/> <source>%1 - copy</source> <translation>%1 - copie</translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="348"/> - <location filename="../../ScanFileOrFolder.cpp" line="414"/> + <location filename="../../ScanFileOrFolder.cpp" line="345"/> <source>%1 - copy (%2)</source> <translation>%1 - copie (%2)</translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="452"/> + <location filename="../../ScanFileOrFolder.cpp" line="401"/> + <source>%name% - copy</source> + <translation type="unfinished">%name% - copie</translation> + </message> + <message> + <location filename="../../ScanFileOrFolder.cpp" line="408"/> + <source>%name% - copy (%number%)</source> + <translation type="unfinished">%name% - copie (%number%)</translation> + </message> + <message> + <location filename="../../ScanFileOrFolder.cpp" line="444"/> <source>This is not a folder</source> <translation>N'est pas un dossier</translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="454"/> + <location filename="../../ScanFileOrFolder.cpp" line="446"/> <source>The folder does exists</source> <translation>Le répertoire n'existe pas</translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="456"/> + <location filename="../../ScanFileOrFolder.cpp" line="448"/> <source>The folder is not readable</source> <translation>Le répertoire n'est pas lisible</translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="467"/> + <location filename="../../ScanFileOrFolder.cpp" line="459"/> <source>Problem with name encoding</source> <translation>Problém d'encodage</translation> </message> @@ -695,9 +693,9 @@ <name>TransferThread</name> <message> <location filename="../../TransferThread.cpp" line="244"/> - <location filename="../../TransferThread.cpp" line="677"/> - <location filename="../../TransferThread.cpp" line="749"/> - <location filename="../../TransferThread.cpp" line="1319"/> + <location filename="../../TransferThread.cpp" line="673"/> + <location filename="../../TransferThread.cpp" line="745"/> + <location filename="../../TransferThread.cpp" line="1315"/> <source>File not found</source> <translation>Fichier non trouvé</translation> </message> @@ -717,39 +715,29 @@ <translation>racine</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="645"/> - <source>%1 - copy</source> - <translation>%1 - copie</translation> - </message> - <message> - <location filename="../../TransferThread.cpp" line="655"/> - <source>%1 - copy (%2)</source> - <translation>%1 - copie (%2)</translation> - </message> - <message> - <location filename="../../TransferThread.cpp" line="791"/> + <location filename="../../TransferThread.cpp" line="787"/> <source>The source doesn't exist</source> <translation>La source n'existe pas</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="715"/> - <location filename="../../TransferThread.cpp" line="830"/> + <location filename="../../TransferThread.cpp" line="711"/> + <location filename="../../TransferThread.cpp" line="826"/> <source>The source file doesn't exist</source> <translation>Le fichier source n'existe pas</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1138"/> + <location filename="../../TransferThread.cpp" line="1134"/> <source>The checksums do not match</source> <translation>Les sommes de controle ne correspondent pas</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1243"/> + <location filename="../../TransferThread.cpp" line="1239"/> <source>Internal error: The size transfered doesn't match</source> <translation>Erreur interne: La taille transféré ne corresponds pas</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="755"/> - <location filename="../../TransferThread.cpp" line="842"/> + <location filename="../../TransferThread.cpp" line="751"/> + <location filename="../../TransferThread.cpp" line="838"/> <source>Unable to do the folder</source> <translation>Impossible de créer le dossier</translation> </message> @@ -771,24 +759,34 @@ <translation>Erreur interne: Déjà ouvert</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="836"/> + <location filename="../../TransferThread.cpp" line="645"/> + <source>%name% - copy</source> + <translation type="unfinished">%name% - copie</translation> + </message> + <message> + <location filename="../../TransferThread.cpp" line="652"/> + <source>%name% - copy (%number%)</source> + <translation type="unfinished">%name% - copie (%number%)</translation> + </message> + <message> + <location filename="../../TransferThread.cpp" line="832"/> <source>Another file exists at same place</source> <translation>Un autre fichier exists à la même place</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1228"/> + <location filename="../../TransferThread.cpp" line="1224"/> <source>Internal error: The destination is not closed</source> <translation>Erreur interne: La destination n'est pas fermé</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1254"/> + <location filename="../../TransferThread.cpp" line="1250"/> <source>Internal error: The buffer is not empty</source> <translation>Erreur interne: Le buffer n'est pas vide</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1319"/> - <location filename="../../TransferThread.cpp" line="1337"/> - <location filename="../../TransferThread.cpp" line="1352"/> + <location filename="../../TransferThread.cpp" line="1315"/> + <location filename="../../TransferThread.cpp" line="1333"/> + <location filename="../../TransferThread.cpp" line="1348"/> <source>Unable to change the date</source> <translation>Impossible de changer la date</translation> </message> @@ -796,22 +794,22 @@ <context> <name>WriteThread</name> <message> - <location filename="../../WriteThread.cpp" line="80"/> + <location filename="../../WriteThread.cpp" line="83"/> <source>Path resolution error (Empty path)</source> <translation>Erreur de résolution de chemain (chemain vide)</translation> </message> <message> - <location filename="../../WriteThread.cpp" line="269"/> + <location filename="../../WriteThread.cpp" line="277"/> <source>Internal error, please report it!</source> <translation>Erreur interne, merci de la reporter!</translation> </message> <message> - <location filename="../../WriteThread.cpp" line="672"/> + <location filename="../../WriteThread.cpp" line="680"/> <source>Unable to read the source file: </source> <translation>Impossible de lire le fichier source: </translation> </message> <message> - <location filename="../../WriteThread.cpp" line="697"/> + <location filename="../../WriteThread.cpp" line="705"/> <source>File truncated during read, possible data change</source> <translation>Fichier rétréci pendant la lecture, possible changement de données</translation> </message> @@ -819,198 +817,198 @@ <context> <name>copyEngineOptions</name> <message> - <location filename="../../copyEngineOptions.ui" line="35"/> + <location filename="../../copyEngineOptions.ui" line="44"/> <source>Transfer</source> <translation>Transfert</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="44"/> + <location filename="../../copyEngineOptions.ui" line="53"/> <source>Move the whole folder</source> <translation>Déplacer le dossier complet</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="51"/> + <location filename="../../copyEngineOptions.ui" line="60"/> <source>Transfer the file rights</source> <translation>Transférer les droits des fichiers</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="61"/> + <location filename="../../copyEngineOptions.ui" line="70"/> <source>Keep the file date</source> <translation>Garder la date du fichier</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="74"/> + <location filename="../../copyEngineOptions.ui" line="83"/> <source>Autostart the transfer</source> <translation>Démarrer automatiquement le transfert</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="81"/> - <location filename="../../copyEngineOptions.ui" line="101"/> + <location filename="../../copyEngineOptions.ui" line="90"/> + <location filename="../../copyEngineOptions.ui" line="110"/> <source>Less performance if checked</source> <translation>Moins de performance si coché</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="104"/> + <location filename="../../copyEngineOptions.ui" line="113"/> <source>Follow the strict order</source> <translation>Suivre l'ordre strict</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="130"/> + <location filename="../../copyEngineOptions.ui" line="139"/> <source>Error and collision</source> <translation>Erreur et collision</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="136"/> + <location filename="../../copyEngineOptions.ui" line="145"/> <source>When folder error</source> <translation>En cas d'erreur de répertoire</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="146"/> + <location filename="../../copyEngineOptions.ui" line="155"/> <source>When file error</source> <translation>En cas d'erreur de fichier</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="172"/> + <location filename="../../copyEngineOptions.ui" line="181"/> <source>When file collision</source> <translation>En cas de collision de fichier</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="232"/> + <location filename="../../copyEngineOptions.ui" line="241"/> <source>When folder collision</source> <translation>Lors d'une collision de dossier</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="263"/> + <location filename="../../copyEngineOptions.ui" line="272"/> <source>Check if destination folder exists</source> <translation>Vérifier si le répertoire de destination existe</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="270"/> + <location filename="../../copyEngineOptions.ui" line="279"/> <source>Renaming rules</source> <translation>Règles de renommage</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="290"/> + <location filename="../../copyEngineOptions.ui" line="299"/> <source>Delete partially transferred files</source> <translation>Supprimer les transferts partiels</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="303"/> + <location filename="../../copyEngineOptions.ui" line="312"/> <source>Rename the original destination</source> <translation>Renommer la destination originale</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="334"/> + <location filename="../../copyEngineOptions.ui" line="343"/> <source>Control</source> <translation>Controle</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="340"/> + <location filename="../../copyEngineOptions.ui" line="349"/> <source>Checksum</source> <translation>Somme de contrôle</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="349"/> + <location filename="../../copyEngineOptions.ui" line="358"/> <source>Only after error</source> <translation>Seulement après erreur</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="356"/> + <location filename="../../copyEngineOptions.ui" line="365"/> <source>Ignore if impossible</source> <translation>Ignorer si impossible</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="373"/> + <location filename="../../copyEngineOptions.ui" line="382"/> <source>Verify checksums</source> <translation>Vérifier les sommes de contrôles</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="405"/> + <location filename="../../copyEngineOptions.ui" line="414"/> <source>Performance</source> <translation>Performance</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="411"/> + <location filename="../../copyEngineOptions.ui" line="420"/> <source>Parallel buffer</source> <translation>Buffer paralléle</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="418"/> - <location filename="../../copyEngineOptions.ui" line="431"/> - <location filename="../../copyEngineOptions.ui" line="444"/> - <location filename="../../copyEngineOptions.ui" line="481"/> - <location filename="../../copyEngineOptions.ui" line="550"/> + <location filename="../../copyEngineOptions.ui" line="427"/> + <location filename="../../copyEngineOptions.ui" line="440"/> + <location filename="../../copyEngineOptions.ui" line="453"/> + <location filename="../../copyEngineOptions.ui" line="490"/> + <location filename="../../copyEngineOptions.ui" line="559"/> <source>KB</source> <translation>Ko</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="460"/> + <location filename="../../copyEngineOptions.ui" line="469"/> <source>Block size</source> <translation>Taille de bloc</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="467"/> + <location filename="../../copyEngineOptions.ui" line="476"/> <source>Sequential buffer</source> <translation>Buffer séquentiel</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="474"/> + <location filename="../../copyEngineOptions.ui" line="483"/> <source>Enable OS buffer</source> <translation>Activer le tampon de l'OS</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="497"/> + <location filename="../../copyEngineOptions.ui" line="506"/> <source>OS buffer only if smaller than</source> <translation>Tampon de l'OS seulement si plus petit que</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="504"/> + <location filename="../../copyEngineOptions.ui" line="513"/> <source>Transfer algorithm</source> <translation>Algorithme de transfert</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="543"/> + <location filename="../../copyEngineOptions.ui" line="552"/> <source>Parallelize if smaller than</source> <translation>Parallèlise si plus petit que</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="573"/> - <source>Inode threads</source> - <translation>Thread d'inode</translation> + <location filename="../../copyEngineOptions.ui" line="582"/> + <source>Inode threads (unsafe > 1)</source> + <translation>Inode threads (non sécurisé> 1)</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="580"/> - <location filename="../../copyEngineOptions.ui" line="590"/> + <location filename="../../copyEngineOptions.ui" line="589"/> + <location filename="../../copyEngineOptions.ui" line="599"/> <source>More cpu, but better organisation on the disk</source> <translation>Plus de cpu mais meilleur organisation sur le disque</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="593"/> + <location filename="../../copyEngineOptions.ui" line="602"/> <source>Order the list</source> <translation>Ordonner la liste</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="609"/> + <location filename="../../copyEngineOptions.ui" line="618"/> <source>Misc</source> <translation>Divers</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="615"/> + <location filename="../../copyEngineOptions.ui" line="624"/> <source>Check the disk space</source> <translation>Vérifier l'espace disque</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="625"/> + <location filename="../../copyEngineOptions.ui" line="634"/> <source>Use this folder when destination is not set</source> <translation>Utiliser ce dossier quand la destination n'est pas défini</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="637"/> + <location filename="../../copyEngineOptions.ui" line="646"/> <source>Browse</source> <translation>Parcourir</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="659"/> + <location filename="../../copyEngineOptions.ui" line="668"/> <source>Filters</source> <translation>Filtres</translation> </message> diff --git a/plugins/CopyEngine/Ultracopier/Languages/hi/translation.ts b/plugins/CopyEngine/Ultracopier/Languages/hi/translation.ts index 4d395a0..e17b3f2 100644 --- a/plugins/CopyEngine/Ultracopier/Languages/hi/translation.ts +++ b/plugins/CopyEngine/Ultracopier/Languages/hi/translation.ts @@ -146,85 +146,85 @@ <context> <name>CopyEngineFactory</name> <message> - <location filename="../../CopyEngineFactory.cpp" line="419"/> - <location filename="../../CopyEngineFactory.cpp" line="422"/> <location filename="../../CopyEngineFactory.cpp" line="427"/> - <location filename="../../CopyEngineFactory.cpp" line="431"/> + <location filename="../../CopyEngineFactory.cpp" line="430"/> + <location filename="../../CopyEngineFactory.cpp" line="435"/> + <location filename="../../CopyEngineFactory.cpp" line="439"/> <source>Ask</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="420"/> - <location filename="../../CopyEngineFactory.cpp" line="424"/> <location filename="../../CopyEngineFactory.cpp" line="428"/> <location filename="../../CopyEngineFactory.cpp" line="432"/> + <location filename="../../CopyEngineFactory.cpp" line="436"/> + <location filename="../../CopyEngineFactory.cpp" line="440"/> <source>Skip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="423"/> + <location filename="../../CopyEngineFactory.cpp" line="431"/> <source>Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="425"/> - <location filename="../../CopyEngineFactory.cpp" line="437"/> + <location filename="../../CopyEngineFactory.cpp" line="433"/> + <location filename="../../CopyEngineFactory.cpp" line="445"/> <source>Rename</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="429"/> + <location filename="../../CopyEngineFactory.cpp" line="437"/> <source>Put at the end</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="433"/> + <location filename="../../CopyEngineFactory.cpp" line="441"/> <source>Overwrite</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="434"/> + <location filename="../../CopyEngineFactory.cpp" line="442"/> <source>Overwrite if different</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="435"/> + <location filename="../../CopyEngineFactory.cpp" line="443"/> <source>Overwrite if newer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="436"/> + <location filename="../../CopyEngineFactory.cpp" line="444"/> <source>Overwrite if older</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="439"/> + <location filename="../../CopyEngineFactory.cpp" line="447"/> <source>Automatic</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="440"/> + <location filename="../../CopyEngineFactory.cpp" line="448"/> <source>Sequential</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="441"/> + <location filename="../../CopyEngineFactory.cpp" line="449"/> <source>Parallel</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="492"/> - <location filename="../../CopyEngineFactory.cpp" line="531"/> + <location filename="../../CopyEngineFactory.cpp" line="500"/> + <location filename="../../CopyEngineFactory.cpp" line="539"/> <source>Options error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="492"/> + <location filename="../../CopyEngineFactory.cpp" line="500"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="531"/> + <location filename="../../CopyEngineFactory.cpp" line="539"/> <source>Options engine is not loaded, can't access to the filters</source> <translation type="unfinished"></translation> </message> @@ -274,21 +274,21 @@ <name>FileExistsDialog</name> <message> <location filename="../../FileExistsDialog.cpp" line="137"/> - <source>%1 - copy</source> + <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="147"/> - <source>%1 - copy (%2)</source> + <location filename="../../FileExistsDialog.cpp" line="144"/> + <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="232"/> + <location filename="../../FileExistsDialog.cpp" line="228"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="232"/> + <location filename="../../FileExistsDialog.cpp" line="228"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -297,21 +297,21 @@ <name>FileIsSameDialog</name> <message> <location filename="../../FileIsSameDialog.cpp" line="111"/> - <source>%1 - copy</source> + <source>%name% - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="121"/> - <source>%1 - copy (%2)</source> + <location filename="../../FileIsSameDialog.cpp" line="118"/> + <source>%name% - copy (%number%)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="188"/> + <location filename="../../FileIsSameDialog.cpp" line="184"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="188"/> + <location filename="../../FileIsSameDialog.cpp" line="184"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -464,21 +464,21 @@ </message> <message> <location filename="../../FolderExistsDialog.cpp" line="122"/> - <source>%1 - copy</source> + <source>%name% - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="132"/> - <source>%1 - copy (%2)</source> + <location filename="../../FolderExistsDialog.cpp" line="131"/> + <source>%name% - copy (%number%)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="193"/> + <location filename="../../FolderExistsDialog.cpp" line="190"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="193"/> + <location filename="../../FolderExistsDialog.cpp" line="190"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -486,49 +486,49 @@ <context> <name>ListThread</name> <message> - <location filename="../../ListThread.cpp" line="1482"/> - <location filename="../../ListThread.cpp" line="2414"/> + <location filename="../../ListThread.cpp" line="1487"/> + <location filename="../../ListThread.cpp" line="2419"/> <source>Unable do to move or copy item into wrong forced mode: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1489"/> - <location filename="../../ListThread.cpp" line="2421"/> + <location filename="../../ListThread.cpp" line="1494"/> + <location filename="../../ListThread.cpp" line="2426"/> <source>Unable to save the transfer list: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1505"/> + <location filename="../../ListThread.cpp" line="1510"/> <source>Problem reading file, or file-size is 0</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1512"/> + <location filename="../../ListThread.cpp" line="1517"/> <source>Wrong header: "%1"</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1521"/> + <location filename="../../ListThread.cpp" line="1526"/> <source>The transfer list is in mixed mode, but this instance is not in this mode</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1530"/> + <location filename="../../ListThread.cpp" line="1535"/> <source>The transfer list is in copy mode, but this instance is not in this mode</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1536"/> + <location filename="../../ListThread.cpp" line="1541"/> <source>The transfer list is in move mode, but this instance is not in this mode</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1599"/> + <location filename="../../ListThread.cpp" line="1604"/> <source>Some errors have been found during the line parsing</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1607"/> + <location filename="../../ListThread.cpp" line="1612"/> <source>Unable to open the transfer list: %1</source> <translation type="unfinished"></translation> </message> @@ -570,24 +570,24 @@ <context> <name>ReadThread</name> <message> - <location filename="../../ReadThread.cpp" line="55"/> + <location filename="../../ReadThread.cpp" line="59"/> <source>Internal error, please report it!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ReadThread.cpp" line="184"/> + <location filename="../../ReadThread.cpp" line="188"/> <source>Internal error reading the source file:block size out of range</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ReadThread.cpp" line="192"/> - <location filename="../../ReadThread.cpp" line="408"/> + <location filename="../../ReadThread.cpp" line="196"/> + <location filename="../../ReadThread.cpp" line="420"/> <source>Unable to read the source file: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ReadThread.cpp" line="233"/> - <location filename="../../ReadThread.cpp" line="456"/> + <location filename="../../ReadThread.cpp" line="237"/> + <location filename="../../ReadThread.cpp" line="468"/> <source>File truncated during the read, possible data change</source> <translation type="unfinished"></translation> </message> @@ -595,37 +595,31 @@ <context> <name>RenamingRules</name> <message> - <location filename="../../RenamingRules.ui" line="26"/> + <location filename="../../RenamingRules.ui" line="35"/> <source>First renaming</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../RenamingRules.ui" line="32"/> - <source>%name% - copy</source> + <location filename="../../RenamingRules.ui" line="41"/> + <source>%name% - copy%suffix%</source> <extracomment>%name% should not be translated</extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../../RenamingRules.ui" line="39"/> - <source><html><head/><body><p>Variables: <span style=" font-weight:600;">%name%</span> for the original file name</p></body></html></source> - <extracomment> should not be translated</extracomment> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../RenamingRules.ui" line="49"/> - <source>Second renaming</source> + <location filename="../../RenamingRules.ui" line="57"/> + <source>%name% - copy (%number%)%suffix%</source> + <extracomment>%name%, %number% should not be translated</extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../../RenamingRules.ui" line="55"/> - <source>%name% - copy (%number%)</source> + <location filename="../../RenamingRules.ui" line="67"/> + <source><html><head/><body><p>Variables: <span style=" font-weight:600;">%name%</span> for the original file name, <span style=" font-weight:600;">%number%</span> for the extra number, <span style=" font-weight:600;">%suffix%</span> file suffix</p></body></html></source> <extracomment>%name%, %number% should not be translated</extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../../RenamingRules.ui" line="62"/> - <source><html><head/><body><p>Variables: <span style=" font-weight:600;">%name%</span> for the original file name</p><p><span style=" font-weight:600;">%number%</span> for the extra number</p></body></html></source> - <extracomment>%name%, %number% should not be translated</extracomment> + <location filename="../../RenamingRules.ui" line="51"/> + <source>Second renaming</source> <translation type="unfinished"></translation> </message> <message> @@ -655,33 +649,41 @@ </message> <message> <location filename="../../ScanFileOrFolder.cpp" line="338"/> - <location filename="../../ScanFileOrFolder.cpp" line="404"/> <source>%1 - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="348"/> - <location filename="../../ScanFileOrFolder.cpp" line="414"/> + <location filename="../../ScanFileOrFolder.cpp" line="345"/> <source>%1 - copy (%2)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="452"/> + <location filename="../../ScanFileOrFolder.cpp" line="401"/> + <source>%name% - copy</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../ScanFileOrFolder.cpp" line="408"/> + <source>%name% - copy (%number%)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../ScanFileOrFolder.cpp" line="444"/> <source>This is not a folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="454"/> + <location filename="../../ScanFileOrFolder.cpp" line="446"/> <source>The folder does exists</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="456"/> + <location filename="../../ScanFileOrFolder.cpp" line="448"/> <source>The folder is not readable</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="467"/> + <location filename="../../ScanFileOrFolder.cpp" line="459"/> <source>Problem with name encoding</source> <translation type="unfinished"></translation> </message> @@ -690,9 +692,9 @@ <name>TransferThread</name> <message> <location filename="../../TransferThread.cpp" line="244"/> - <location filename="../../TransferThread.cpp" line="677"/> - <location filename="../../TransferThread.cpp" line="749"/> - <location filename="../../TransferThread.cpp" line="1319"/> + <location filename="../../TransferThread.cpp" line="673"/> + <location filename="../../TransferThread.cpp" line="745"/> + <location filename="../../TransferThread.cpp" line="1315"/> <source>File not found</source> <translation type="unfinished"></translation> </message> @@ -725,60 +727,60 @@ </message> <message> <location filename="../../TransferThread.cpp" line="645"/> - <source>%1 - copy</source> + <source>%name% - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="655"/> - <source>%1 - copy (%2)</source> + <location filename="../../TransferThread.cpp" line="652"/> + <source>%name% - copy (%number%)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="715"/> - <location filename="../../TransferThread.cpp" line="830"/> + <location filename="../../TransferThread.cpp" line="711"/> + <location filename="../../TransferThread.cpp" line="826"/> <source>The source file doesn't exist</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="755"/> - <location filename="../../TransferThread.cpp" line="842"/> + <location filename="../../TransferThread.cpp" line="751"/> + <location filename="../../TransferThread.cpp" line="838"/> <source>Unable to do the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="791"/> + <location filename="../../TransferThread.cpp" line="787"/> <source>The source doesn't exist</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="836"/> + <location filename="../../TransferThread.cpp" line="832"/> <source>Another file exists at same place</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1138"/> + <location filename="../../TransferThread.cpp" line="1134"/> <source>The checksums do not match</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1228"/> + <location filename="../../TransferThread.cpp" line="1224"/> <source>Internal error: The destination is not closed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1243"/> + <location filename="../../TransferThread.cpp" line="1239"/> <source>Internal error: The size transfered doesn't match</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1254"/> + <location filename="../../TransferThread.cpp" line="1250"/> <source>Internal error: The buffer is not empty</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1319"/> - <location filename="../../TransferThread.cpp" line="1337"/> - <location filename="../../TransferThread.cpp" line="1352"/> + <location filename="../../TransferThread.cpp" line="1315"/> + <location filename="../../TransferThread.cpp" line="1333"/> + <location filename="../../TransferThread.cpp" line="1348"/> <source>Unable to change the date</source> <translation type="unfinished"></translation> </message> @@ -791,22 +793,22 @@ <context> <name>WriteThread</name> <message> - <location filename="../../WriteThread.cpp" line="80"/> + <location filename="../../WriteThread.cpp" line="83"/> <source>Path resolution error (Empty path)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../WriteThread.cpp" line="269"/> + <location filename="../../WriteThread.cpp" line="277"/> <source>Internal error, please report it!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../WriteThread.cpp" line="672"/> + <location filename="../../WriteThread.cpp" line="680"/> <source>Unable to read the source file: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../WriteThread.cpp" line="697"/> + <location filename="../../WriteThread.cpp" line="705"/> <source>File truncated during read, possible data change</source> <translation type="unfinished"></translation> </message> @@ -814,198 +816,198 @@ <context> <name>copyEngineOptions</name> <message> - <location filename="../../copyEngineOptions.ui" line="35"/> + <location filename="../../copyEngineOptions.ui" line="44"/> <source>Transfer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="44"/> + <location filename="../../copyEngineOptions.ui" line="53"/> <source>Move the whole folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="51"/> + <location filename="../../copyEngineOptions.ui" line="60"/> <source>Transfer the file rights</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="61"/> + <location filename="../../copyEngineOptions.ui" line="70"/> <source>Keep the file date</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="74"/> + <location filename="../../copyEngineOptions.ui" line="83"/> <source>Autostart the transfer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="81"/> - <location filename="../../copyEngineOptions.ui" line="101"/> + <location filename="../../copyEngineOptions.ui" line="90"/> + <location filename="../../copyEngineOptions.ui" line="110"/> <source>Less performance if checked</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="104"/> + <location filename="../../copyEngineOptions.ui" line="113"/> <source>Follow the strict order</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="130"/> + <location filename="../../copyEngineOptions.ui" line="139"/> <source>Error and collision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="136"/> + <location filename="../../copyEngineOptions.ui" line="145"/> <source>When folder error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="146"/> + <location filename="../../copyEngineOptions.ui" line="155"/> <source>When file error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="172"/> + <location filename="../../copyEngineOptions.ui" line="181"/> <source>When file collision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="232"/> + <location filename="../../copyEngineOptions.ui" line="241"/> <source>When folder collision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="263"/> + <location filename="../../copyEngineOptions.ui" line="272"/> <source>Check if destination folder exists</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="270"/> + <location filename="../../copyEngineOptions.ui" line="279"/> <source>Renaming rules</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="290"/> + <location filename="../../copyEngineOptions.ui" line="299"/> <source>Delete partially transferred files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="303"/> + <location filename="../../copyEngineOptions.ui" line="312"/> <source>Rename the original destination</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="334"/> + <location filename="../../copyEngineOptions.ui" line="343"/> <source>Control</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="340"/> + <location filename="../../copyEngineOptions.ui" line="349"/> <source>Checksum</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="349"/> + <location filename="../../copyEngineOptions.ui" line="358"/> <source>Only after error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="356"/> + <location filename="../../copyEngineOptions.ui" line="365"/> <source>Ignore if impossible</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="373"/> + <location filename="../../copyEngineOptions.ui" line="382"/> <source>Verify checksums</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="405"/> + <location filename="../../copyEngineOptions.ui" line="414"/> <source>Performance</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="411"/> + <location filename="../../copyEngineOptions.ui" line="420"/> <source>Parallel buffer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="418"/> - <location filename="../../copyEngineOptions.ui" line="431"/> - <location filename="../../copyEngineOptions.ui" line="444"/> - <location filename="../../copyEngineOptions.ui" line="481"/> - <location filename="../../copyEngineOptions.ui" line="550"/> + <location filename="../../copyEngineOptions.ui" line="427"/> + <location filename="../../copyEngineOptions.ui" line="440"/> + <location filename="../../copyEngineOptions.ui" line="453"/> + <location filename="../../copyEngineOptions.ui" line="490"/> + <location filename="../../copyEngineOptions.ui" line="559"/> <source>KB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="460"/> + <location filename="../../copyEngineOptions.ui" line="469"/> <source>Block size</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="467"/> + <location filename="../../copyEngineOptions.ui" line="476"/> <source>Sequential buffer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="474"/> + <location filename="../../copyEngineOptions.ui" line="483"/> <source>Enable OS buffer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="497"/> + <location filename="../../copyEngineOptions.ui" line="506"/> <source>OS buffer only if smaller than</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="504"/> + <location filename="../../copyEngineOptions.ui" line="513"/> <source>Transfer algorithm</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="543"/> + <location filename="../../copyEngineOptions.ui" line="552"/> <source>Parallelize if smaller than</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="573"/> - <source>Inode threads</source> + <location filename="../../copyEngineOptions.ui" line="582"/> + <source>Inode threads (unsafe > 1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="580"/> - <location filename="../../copyEngineOptions.ui" line="590"/> + <location filename="../../copyEngineOptions.ui" line="589"/> + <location filename="../../copyEngineOptions.ui" line="599"/> <source>More cpu, but better organisation on the disk</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="593"/> + <location filename="../../copyEngineOptions.ui" line="602"/> <source>Order the list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="609"/> + <location filename="../../copyEngineOptions.ui" line="618"/> <source>Misc</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="615"/> + <location filename="../../copyEngineOptions.ui" line="624"/> <source>Check the disk space</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="625"/> + <location filename="../../copyEngineOptions.ui" line="634"/> <source>Use this folder when destination is not set</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="637"/> + <location filename="../../copyEngineOptions.ui" line="646"/> <source>Browse</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="659"/> + <location filename="../../copyEngineOptions.ui" line="668"/> <source>Filters</source> <translation type="unfinished"></translation> </message> diff --git a/plugins/CopyEngine/Ultracopier/Languages/hu/translation.ts b/plugins/CopyEngine/Ultracopier/Languages/hu/translation.ts index 0745ac7..ca0151e 100644 --- a/plugins/CopyEngine/Ultracopier/Languages/hu/translation.ts +++ b/plugins/CopyEngine/Ultracopier/Languages/hu/translation.ts @@ -146,85 +146,85 @@ <context> <name>CopyEngineFactory</name> <message> - <location filename="../../CopyEngineFactory.cpp" line="419"/> - <location filename="../../CopyEngineFactory.cpp" line="422"/> <location filename="../../CopyEngineFactory.cpp" line="427"/> - <location filename="../../CopyEngineFactory.cpp" line="431"/> + <location filename="../../CopyEngineFactory.cpp" line="430"/> + <location filename="../../CopyEngineFactory.cpp" line="435"/> + <location filename="../../CopyEngineFactory.cpp" line="439"/> <source>Ask</source> <translation>Kérdezzen rá</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="420"/> - <location filename="../../CopyEngineFactory.cpp" line="424"/> <location filename="../../CopyEngineFactory.cpp" line="428"/> <location filename="../../CopyEngineFactory.cpp" line="432"/> + <location filename="../../CopyEngineFactory.cpp" line="436"/> + <location filename="../../CopyEngineFactory.cpp" line="440"/> <source>Skip</source> <translation>Kihagy</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="423"/> + <location filename="../../CopyEngineFactory.cpp" line="431"/> <source>Merge</source> <translation>Összeolvaszt</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="425"/> - <location filename="../../CopyEngineFactory.cpp" line="437"/> + <location filename="../../CopyEngineFactory.cpp" line="433"/> + <location filename="../../CopyEngineFactory.cpp" line="445"/> <source>Rename</source> <translation>Nevezze át</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="429"/> + <location filename="../../CopyEngineFactory.cpp" line="437"/> <source>Put at the end</source> <translation>Helyezze a végére</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="433"/> + <location filename="../../CopyEngineFactory.cpp" line="441"/> <source>Overwrite</source> <translation>Felülír</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="434"/> + <location filename="../../CopyEngineFactory.cpp" line="442"/> <source>Overwrite if different</source> <translation>Felülír, ha különbözik</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="435"/> + <location filename="../../CopyEngineFactory.cpp" line="443"/> <source>Overwrite if newer</source> <translation>Felülír, ha újabb</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="436"/> + <location filename="../../CopyEngineFactory.cpp" line="444"/> <source>Overwrite if older</source> <translation>Felülír, ha régebbi</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="439"/> + <location filename="../../CopyEngineFactory.cpp" line="447"/> <source>Automatic</source> <translation>Automatikus</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="440"/> + <location filename="../../CopyEngineFactory.cpp" line="448"/> <source>Sequential</source> <translation>Szekvenciális</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="441"/> + <location filename="../../CopyEngineFactory.cpp" line="449"/> <source>Parallel</source> <translation>Párhuzamos</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="492"/> - <location filename="../../CopyEngineFactory.cpp" line="531"/> + <location filename="../../CopyEngineFactory.cpp" line="500"/> + <location filename="../../CopyEngineFactory.cpp" line="539"/> <source>Options error</source> <translation>Beállítási hiba</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="492"/> + <location filename="../../CopyEngineFactory.cpp" line="500"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation>A beállítási motor nincs betöltve. A szűrők elérése nem lehetséges</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="531"/> + <location filename="../../CopyEngineFactory.cpp" line="539"/> <source>Options engine is not loaded, can't access to the filters</source> <translation>A beállítási motor nincs betöltve, a szűrők elérése nem lehetséges</translation> </message> @@ -274,21 +274,21 @@ <name>FileExistsDialog</name> <message> <location filename="../../FileExistsDialog.cpp" line="137"/> - <source>%1 - copy</source> - <translation>%1 - másolás</translation> + <source>%name% - copy%suffix%</source> + <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="147"/> - <source>%1 - copy (%2)</source> - <translation>%1 - másolás (%2)</translation> + <location filename="../../FileExistsDialog.cpp" line="144"/> + <source>%name% - copy (%number%)%suffix%</source> + <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="232"/> + <location filename="../../FileExistsDialog.cpp" line="228"/> <source>Error</source> <translation>Hiba</translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="232"/> + <location filename="../../FileExistsDialog.cpp" line="228"/> <source>Try rename with using special characters</source> <translation>Átnevezés speciális karakterek használatával</translation> </message> @@ -297,21 +297,21 @@ <name>FileIsSameDialog</name> <message> <location filename="../../FileIsSameDialog.cpp" line="111"/> - <source>%1 - copy</source> - <translation>%1 - másolás</translation> + <source>%name% - copy</source> + <translation type="unfinished">%name% - másolás</translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="121"/> - <source>%1 - copy (%2)</source> - <translation>%1 - másolás (%2)</translation> + <location filename="../../FileIsSameDialog.cpp" line="118"/> + <source>%name% - copy (%number%)</source> + <translation type="unfinished">%name% - másolás (%number%)</translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="188"/> + <location filename="../../FileIsSameDialog.cpp" line="184"/> <source>Error</source> <translation>Hiba</translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="188"/> + <location filename="../../FileIsSameDialog.cpp" line="184"/> <source>Try rename with using special characters</source> <translation>Átnevezés speciális karakterek használatával</translation> </message> @@ -464,21 +464,21 @@ </message> <message> <location filename="../../FolderExistsDialog.cpp" line="122"/> - <source>%1 - copy</source> - <translation>%1 - másolás</translation> + <source>%name% - copy</source> + <translation type="unfinished">%name% - másolás</translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="132"/> - <source>%1 - copy (%2)</source> - <translation>%1 - másolás (%2)</translation> + <location filename="../../FolderExistsDialog.cpp" line="131"/> + <source>%name% - copy (%number%)</source> + <translation type="unfinished">%name% - másolás (%number%)</translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="193"/> + <location filename="../../FolderExistsDialog.cpp" line="190"/> <source>Error</source> <translation>Hiba</translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="193"/> + <location filename="../../FolderExistsDialog.cpp" line="190"/> <source>Try rename with using special characters</source> <translation>Átnevezés speciális karakterek használatával</translation> </message> @@ -486,49 +486,49 @@ <context> <name>ListThread</name> <message> - <location filename="../../ListThread.cpp" line="1482"/> - <location filename="../../ListThread.cpp" line="2414"/> + <location filename="../../ListThread.cpp" line="1487"/> + <location filename="../../ListThread.cpp" line="2419"/> <source>Unable do to move or copy item into wrong forced mode: %1</source> <translation>Elem másolása vagy mozgatás nem lehetséges a hibás kényszerített módban: %1</translation> </message> <message> - <location filename="../../ListThread.cpp" line="1489"/> - <location filename="../../ListThread.cpp" line="2421"/> + <location filename="../../ListThread.cpp" line="1494"/> + <location filename="../../ListThread.cpp" line="2426"/> <source>Unable to save the transfer list: %1</source> <translation>Átviteli lista mentése nem lehetséges: %1</translation> </message> <message> - <location filename="../../ListThread.cpp" line="1505"/> + <location filename="../../ListThread.cpp" line="1510"/> <source>Problem reading file, or file-size is 0</source> <translation>Hiba a fájl olvasásánál vagy a fálméret 0</translation> </message> <message> - <location filename="../../ListThread.cpp" line="1512"/> + <location filename="../../ListThread.cpp" line="1517"/> <source>Wrong header: "%1"</source> <translation>Hibás fejléc: "%1"</translation> </message> <message> - <location filename="../../ListThread.cpp" line="1521"/> + <location filename="../../ListThread.cpp" line="1526"/> <source>The transfer list is in mixed mode, but this instance is not in this mode</source> <translation>Az átviteli lista kevert módban van, de ez a példány nincs</translation> </message> <message> - <location filename="../../ListThread.cpp" line="1530"/> + <location filename="../../ListThread.cpp" line="1535"/> <source>The transfer list is in copy mode, but this instance is not in this mode</source> <translation>Az átviteli lista másolás módban van, de ez a példány nincs</translation> </message> <message> - <location filename="../../ListThread.cpp" line="1536"/> + <location filename="../../ListThread.cpp" line="1541"/> <source>The transfer list is in move mode, but this instance is not in this mode</source> <translation>Az átviteli lista mozgatás módban van, de ez a példány nincs</translation> </message> <message> - <location filename="../../ListThread.cpp" line="1599"/> + <location filename="../../ListThread.cpp" line="1604"/> <source>Some errors have been found during the line parsing</source> <translation>Néhány hiba történt a sorelemzés során</translation> </message> <message> - <location filename="../../ListThread.cpp" line="1607"/> + <location filename="../../ListThread.cpp" line="1612"/> <source>Unable to open the transfer list: %1</source> <translation>Az átviteli lista megnyitása nem lehetséges: %1</translation> </message> @@ -570,24 +570,24 @@ <context> <name>ReadThread</name> <message> - <location filename="../../ReadThread.cpp" line="55"/> + <location filename="../../ReadThread.cpp" line="59"/> <source>Internal error, please report it!</source> <translation>Belső hiba, kérlek jelentsd!</translation> </message> <message> - <location filename="../../ReadThread.cpp" line="184"/> + <location filename="../../ReadThread.cpp" line="188"/> <source>Internal error reading the source file:block size out of range</source> <translation>Belső hiba történt a forrásfájl olvasásakor: a blokkméret tartományon kívüli</translation> </message> <message> - <location filename="../../ReadThread.cpp" line="192"/> - <location filename="../../ReadThread.cpp" line="408"/> + <location filename="../../ReadThread.cpp" line="196"/> + <location filename="../../ReadThread.cpp" line="420"/> <source>Unable to read the source file: </source> <translation>A forrásfájl olvasása nem lehetséges:</translation> </message> <message> - <location filename="../../ReadThread.cpp" line="233"/> - <location filename="../../ReadThread.cpp" line="456"/> + <location filename="../../ReadThread.cpp" line="237"/> + <location filename="../../ReadThread.cpp" line="468"/> <source>File truncated during the read, possible data change</source> <translation>A fájl olvasás során megcsonkult, valószínűleg adatváltozás miatt</translation> </message> @@ -600,38 +600,32 @@ <translation>Átnevezési szabályok</translation> </message> <message> - <location filename="../../RenamingRules.ui" line="26"/> + <location filename="../../RenamingRules.ui" line="35"/> <source>First renaming</source> <translation>Első átnevezés</translation> </message> <message> - <location filename="../../RenamingRules.ui" line="32"/> - <source>%name% - copy</source> + <location filename="../../RenamingRules.ui" line="41"/> + <source>%name% - copy%suffix%</source> <extracomment>%name% should not be translated</extracomment> - <translation>%name% - másolás</translation> - </message> - <message> - <location filename="../../RenamingRules.ui" line="39"/> - <source><html><head/><body><p>Variables: <span style=" font-weight:600;">%name%</span> for the original file name</p></body></html></source> - <extracomment> should not be translated</extracomment> - <translation><html><head/><body><p>Változók: <span style=" font-weight:600;">%name%</span> az eredeti fájlnévhez</p></body></html></translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="../../RenamingRules.ui" line="49"/> - <source>Second renaming</source> - <translation>Második átnevezés</translation> + <location filename="../../RenamingRules.ui" line="57"/> + <source>%name% - copy (%number%)%suffix%</source> + <extracomment>%name%, %number% should not be translated</extracomment> + <translation type="unfinished"></translation> </message> <message> - <location filename="../../RenamingRules.ui" line="55"/> - <source>%name% - copy (%number%)</source> + <location filename="../../RenamingRules.ui" line="67"/> + <source><html><head/><body><p>Variables: <span style=" font-weight:600;">%name%</span> for the original file name, <span style=" font-weight:600;">%number%</span> for the extra number, <span style=" font-weight:600;">%suffix%</span> file suffix</p></body></html></source> <extracomment>%name%, %number% should not be translated</extracomment> - <translation>%name% - másolás (%number%)</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="../../RenamingRules.ui" line="62"/> - <source><html><head/><body><p>Variables: <span style=" font-weight:600;">%name%</span> for the original file name</p><p><span style=" font-weight:600;">%number%</span> for the extra number</p></body></html></source> - <extracomment>%name%, %number% should not be translated</extracomment> - <translation><html><head/><body><p>Változók: <span style=" font-weight:600;">%name%</span> az eredeti fájlnévhez</p><p><span style=" font-weight:600;">%number%</span> az extra számhoz</p></body></html></translation> + <location filename="../../RenamingRules.ui" line="51"/> + <source>Second renaming</source> + <translation>Második átnevezés</translation> </message> <message> <location filename="../../RenamingRules.cpp" line="39"/> @@ -655,33 +649,41 @@ </message> <message> <location filename="../../ScanFileOrFolder.cpp" line="338"/> - <location filename="../../ScanFileOrFolder.cpp" line="404"/> <source>%1 - copy</source> <translation>%1 - másolás</translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="348"/> - <location filename="../../ScanFileOrFolder.cpp" line="414"/> + <location filename="../../ScanFileOrFolder.cpp" line="345"/> <source>%1 - copy (%2)</source> <translation>%1 - másolás (%2)</translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="452"/> + <location filename="../../ScanFileOrFolder.cpp" line="401"/> + <source>%name% - copy</source> + <translation type="unfinished">%name% - másolás</translation> + </message> + <message> + <location filename="../../ScanFileOrFolder.cpp" line="408"/> + <source>%name% - copy (%number%)</source> + <translation type="unfinished">%name% - másolás (%number%)</translation> + </message> + <message> + <location filename="../../ScanFileOrFolder.cpp" line="444"/> <source>This is not a folder</source> <translation>Ez nem mappa</translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="454"/> + <location filename="../../ScanFileOrFolder.cpp" line="446"/> <source>The folder does exists</source> <translation>A mappa létezik</translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="456"/> + <location filename="../../ScanFileOrFolder.cpp" line="448"/> <source>The folder is not readable</source> <translation>A mappa nem olvasható</translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="467"/> + <location filename="../../ScanFileOrFolder.cpp" line="459"/> <source>Problem with name encoding</source> <translation>Probléma a névkódolással</translation> </message> @@ -690,9 +692,9 @@ <name>TransferThread</name> <message> <location filename="../../TransferThread.cpp" line="244"/> - <location filename="../../TransferThread.cpp" line="677"/> - <location filename="../../TransferThread.cpp" line="749"/> - <location filename="../../TransferThread.cpp" line="1319"/> + <location filename="../../TransferThread.cpp" line="673"/> + <location filename="../../TransferThread.cpp" line="745"/> + <location filename="../../TransferThread.cpp" line="1315"/> <source>File not found</source> <translation>Fájl nem található</translation> </message> @@ -712,23 +714,13 @@ <translation type="unfinished">gyökér</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="645"/> - <source>%1 - copy</source> - <translation type="unfinished">%1 - másolás</translation> - </message> - <message> - <location filename="../../TransferThread.cpp" line="655"/> - <source>%1 - copy (%2)</source> - <translation type="unfinished">%1 - másolás (%2)</translation> - </message> - <message> - <location filename="../../TransferThread.cpp" line="791"/> + <location filename="../../TransferThread.cpp" line="787"/> <source>The source doesn't exist</source> <translation type="unfinished">A forrás nem létezik</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="755"/> - <location filename="../../TransferThread.cpp" line="842"/> + <location filename="../../TransferThread.cpp" line="751"/> + <location filename="../../TransferThread.cpp" line="838"/> <source>Unable to do the folder</source> <translation type="unfinished">Mappaművelet nem lehetséges</translation> </message> @@ -750,40 +742,50 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="715"/> - <location filename="../../TransferThread.cpp" line="830"/> + <location filename="../../TransferThread.cpp" line="645"/> + <source>%name% - copy</source> + <translation type="unfinished">%name% - másolás</translation> + </message> + <message> + <location filename="../../TransferThread.cpp" line="652"/> + <source>%name% - copy (%number%)</source> + <translation type="unfinished">%name% - másolás (%number%)</translation> + </message> + <message> + <location filename="../../TransferThread.cpp" line="711"/> + <location filename="../../TransferThread.cpp" line="826"/> <source>The source file doesn't exist</source> <translation type="unfinished">A forrásfájl nem létezik</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="836"/> + <location filename="../../TransferThread.cpp" line="832"/> <source>Another file exists at same place</source> <translation type="unfinished">Egy másik fájl létezik ugyanazon a helyen</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1138"/> + <location filename="../../TransferThread.cpp" line="1134"/> <source>The checksums do not match</source> <translation type="unfinished">A checksumok nem egyeznek meg</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1228"/> + <location filename="../../TransferThread.cpp" line="1224"/> <source>Internal error: The destination is not closed</source> <translation type="unfinished">Belső hiba: a cél nincs bezárva</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1243"/> + <location filename="../../TransferThread.cpp" line="1239"/> <source>Internal error: The size transfered doesn't match</source> <translation type="unfinished">Belső hiba: az átvitt méret nem egyezik meg</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1254"/> + <location filename="../../TransferThread.cpp" line="1250"/> <source>Internal error: The buffer is not empty</source> <translation type="unfinished">Belső hiba: a puffer nem üres</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1319"/> - <location filename="../../TransferThread.cpp" line="1337"/> - <location filename="../../TransferThread.cpp" line="1352"/> + <location filename="../../TransferThread.cpp" line="1315"/> + <location filename="../../TransferThread.cpp" line="1333"/> + <location filename="../../TransferThread.cpp" line="1348"/> <source>Unable to change the date</source> <translation type="unfinished"></translation> </message> @@ -791,22 +793,22 @@ <context> <name>WriteThread</name> <message> - <location filename="../../WriteThread.cpp" line="80"/> + <location filename="../../WriteThread.cpp" line="83"/> <source>Path resolution error (Empty path)</source> <translation>Útvonal feloldási hiba (Üres útvonal)</translation> </message> <message> - <location filename="../../WriteThread.cpp" line="269"/> + <location filename="../../WriteThread.cpp" line="277"/> <source>Internal error, please report it!</source> <translation>Belső hiba, kérlek jelentsd!</translation> </message> <message> - <location filename="../../WriteThread.cpp" line="672"/> + <location filename="../../WriteThread.cpp" line="680"/> <source>Unable to read the source file: </source> <translation>A forrásfájl olvasása nem lehetséges:</translation> </message> <message> - <location filename="../../WriteThread.cpp" line="697"/> + <location filename="../../WriteThread.cpp" line="705"/> <source>File truncated during read, possible data change</source> <translation>Fájl megsérült az olvasás közben, valószínűleg adatváltozás</translation> </message> @@ -814,198 +816,198 @@ <context> <name>copyEngineOptions</name> <message> - <location filename="../../copyEngineOptions.ui" line="35"/> + <location filename="../../copyEngineOptions.ui" line="44"/> <source>Transfer</source> <translation>Átvitel</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="44"/> + <location filename="../../copyEngineOptions.ui" line="53"/> <source>Move the whole folder</source> <translation>Mozgassa át az egész mappát</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="51"/> + <location filename="../../copyEngineOptions.ui" line="60"/> <source>Transfer the file rights</source> <translation>Fájljogok átadása</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="61"/> + <location filename="../../copyEngineOptions.ui" line="70"/> <source>Keep the file date</source> <translation>Fájl dátumának megtartása</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="74"/> + <location filename="../../copyEngineOptions.ui" line="83"/> <source>Autostart the transfer</source> <translation>Átvitel automatikus indítása</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="81"/> - <location filename="../../copyEngineOptions.ui" line="101"/> + <location filename="../../copyEngineOptions.ui" line="90"/> + <location filename="../../copyEngineOptions.ui" line="110"/> <source>Less performance if checked</source> <translation>Kisebb teljesítmény, ha be van jelölve</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="104"/> + <location filename="../../copyEngineOptions.ui" line="113"/> <source>Follow the strict order</source> <translation>Kövesse a szigorú sorrendet</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="130"/> + <location filename="../../copyEngineOptions.ui" line="139"/> <source>Error and collision</source> <translation>Hiba és ütközés</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="136"/> + <location filename="../../copyEngineOptions.ui" line="145"/> <source>When folder error</source> <translation>Mappa hiba esetén</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="146"/> + <location filename="../../copyEngineOptions.ui" line="155"/> <source>When file error</source> <translation>Fájl hiba esetén</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="172"/> + <location filename="../../copyEngineOptions.ui" line="181"/> <source>When file collision</source> <translation>Fájl ütközés esetén</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="232"/> + <location filename="../../copyEngineOptions.ui" line="241"/> <source>When folder collision</source> <translation>Mappa ütközés esetén</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="263"/> + <location filename="../../copyEngineOptions.ui" line="272"/> <source>Check if destination folder exists</source> <translation>Célmappa létezésének ellenőrzése</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="270"/> + <location filename="../../copyEngineOptions.ui" line="279"/> <source>Renaming rules</source> <translation>Átnevezési szabályok</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="290"/> + <location filename="../../copyEngineOptions.ui" line="299"/> <source>Delete partially transferred files</source> <translation>Részben átvitt fájlok törlése</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="303"/> + <location filename="../../copyEngineOptions.ui" line="312"/> <source>Rename the original destination</source> <translation>Eredeti cél átnevezése</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="334"/> + <location filename="../../copyEngineOptions.ui" line="343"/> <source>Control</source> <translation>Irányítás</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="340"/> + <location filename="../../copyEngineOptions.ui" line="349"/> <source>Checksum</source> <translation>Checksum</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="349"/> + <location filename="../../copyEngineOptions.ui" line="358"/> <source>Only after error</source> <translation>Csak hiba után</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="356"/> + <location filename="../../copyEngineOptions.ui" line="365"/> <source>Ignore if impossible</source> <translation>Hagyja ki, ha nem lehetséges</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="373"/> + <location filename="../../copyEngineOptions.ui" line="382"/> <source>Verify checksums</source> <translation>Checksumok ellenőrzése</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="405"/> + <location filename="../../copyEngineOptions.ui" line="414"/> <source>Performance</source> <translation>Teljesítmény</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="411"/> + <location filename="../../copyEngineOptions.ui" line="420"/> <source>Parallel buffer</source> <translation>Párhuzamos puffer</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="418"/> - <location filename="../../copyEngineOptions.ui" line="431"/> - <location filename="../../copyEngineOptions.ui" line="444"/> - <location filename="../../copyEngineOptions.ui" line="481"/> - <location filename="../../copyEngineOptions.ui" line="550"/> + <location filename="../../copyEngineOptions.ui" line="427"/> + <location filename="../../copyEngineOptions.ui" line="440"/> + <location filename="../../copyEngineOptions.ui" line="453"/> + <location filename="../../copyEngineOptions.ui" line="490"/> + <location filename="../../copyEngineOptions.ui" line="559"/> <source>KB</source> <translation>KB</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="460"/> + <location filename="../../copyEngineOptions.ui" line="469"/> <source>Block size</source> <translation>Blokkméret</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="467"/> + <location filename="../../copyEngineOptions.ui" line="476"/> <source>Sequential buffer</source> <translation>Szekvenciális puffer</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="474"/> + <location filename="../../copyEngineOptions.ui" line="483"/> <source>Enable OS buffer</source> <translation>OS puffer engedélyezése</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="497"/> + <location filename="../../copyEngineOptions.ui" line="506"/> <source>OS buffer only if smaller than</source> <translation>OS buffer csak akkor, ha kisebb mint</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="504"/> + <location filename="../../copyEngineOptions.ui" line="513"/> <source>Transfer algorithm</source> <translation>Átviteli algoritmus</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="543"/> + <location filename="../../copyEngineOptions.ui" line="552"/> <source>Parallelize if smaller than</source> <translation>Párhuzamosítás, ha kisebb mint</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="573"/> - <source>Inode threads</source> - <translation>Inode szálak</translation> + <location filename="../../copyEngineOptions.ui" line="582"/> + <source>Inode threads (unsafe > 1)</source> + <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="580"/> - <location filename="../../copyEngineOptions.ui" line="590"/> + <location filename="../../copyEngineOptions.ui" line="589"/> + <location filename="../../copyEngineOptions.ui" line="599"/> <source>More cpu, but better organisation on the disk</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="593"/> + <location filename="../../copyEngineOptions.ui" line="602"/> <source>Order the list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="609"/> + <location filename="../../copyEngineOptions.ui" line="618"/> <source>Misc</source> <translation>Egyéb</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="615"/> + <location filename="../../copyEngineOptions.ui" line="624"/> <source>Check the disk space</source> <translation>Lemezterület ellenőrzése</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="625"/> + <location filename="../../copyEngineOptions.ui" line="634"/> <source>Use this folder when destination is not set</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="637"/> + <location filename="../../copyEngineOptions.ui" line="646"/> <source>Browse</source> <translation>Tallózás</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="659"/> + <location filename="../../copyEngineOptions.ui" line="668"/> <source>Filters</source> <translation>Szűrők</translation> </message> diff --git a/plugins/CopyEngine/Ultracopier/Languages/id/translation.ts b/plugins/CopyEngine/Ultracopier/Languages/id/translation.ts index 4d395a0..e17b3f2 100644 --- a/plugins/CopyEngine/Ultracopier/Languages/id/translation.ts +++ b/plugins/CopyEngine/Ultracopier/Languages/id/translation.ts @@ -146,85 +146,85 @@ <context> <name>CopyEngineFactory</name> <message> - <location filename="../../CopyEngineFactory.cpp" line="419"/> - <location filename="../../CopyEngineFactory.cpp" line="422"/> <location filename="../../CopyEngineFactory.cpp" line="427"/> - <location filename="../../CopyEngineFactory.cpp" line="431"/> + <location filename="../../CopyEngineFactory.cpp" line="430"/> + <location filename="../../CopyEngineFactory.cpp" line="435"/> + <location filename="../../CopyEngineFactory.cpp" line="439"/> <source>Ask</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="420"/> - <location filename="../../CopyEngineFactory.cpp" line="424"/> <location filename="../../CopyEngineFactory.cpp" line="428"/> <location filename="../../CopyEngineFactory.cpp" line="432"/> + <location filename="../../CopyEngineFactory.cpp" line="436"/> + <location filename="../../CopyEngineFactory.cpp" line="440"/> <source>Skip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="423"/> + <location filename="../../CopyEngineFactory.cpp" line="431"/> <source>Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="425"/> - <location filename="../../CopyEngineFactory.cpp" line="437"/> + <location filename="../../CopyEngineFactory.cpp" line="433"/> + <location filename="../../CopyEngineFactory.cpp" line="445"/> <source>Rename</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="429"/> + <location filename="../../CopyEngineFactory.cpp" line="437"/> <source>Put at the end</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="433"/> + <location filename="../../CopyEngineFactory.cpp" line="441"/> <source>Overwrite</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="434"/> + <location filename="../../CopyEngineFactory.cpp" line="442"/> <source>Overwrite if different</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="435"/> + <location filename="../../CopyEngineFactory.cpp" line="443"/> <source>Overwrite if newer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="436"/> + <location filename="../../CopyEngineFactory.cpp" line="444"/> <source>Overwrite if older</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="439"/> + <location filename="../../CopyEngineFactory.cpp" line="447"/> <source>Automatic</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="440"/> + <location filename="../../CopyEngineFactory.cpp" line="448"/> <source>Sequential</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="441"/> + <location filename="../../CopyEngineFactory.cpp" line="449"/> <source>Parallel</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="492"/> - <location filename="../../CopyEngineFactory.cpp" line="531"/> + <location filename="../../CopyEngineFactory.cpp" line="500"/> + <location filename="../../CopyEngineFactory.cpp" line="539"/> <source>Options error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="492"/> + <location filename="../../CopyEngineFactory.cpp" line="500"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="531"/> + <location filename="../../CopyEngineFactory.cpp" line="539"/> <source>Options engine is not loaded, can't access to the filters</source> <translation type="unfinished"></translation> </message> @@ -274,21 +274,21 @@ <name>FileExistsDialog</name> <message> <location filename="../../FileExistsDialog.cpp" line="137"/> - <source>%1 - copy</source> + <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="147"/> - <source>%1 - copy (%2)</source> + <location filename="../../FileExistsDialog.cpp" line="144"/> + <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="232"/> + <location filename="../../FileExistsDialog.cpp" line="228"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="232"/> + <location filename="../../FileExistsDialog.cpp" line="228"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -297,21 +297,21 @@ <name>FileIsSameDialog</name> <message> <location filename="../../FileIsSameDialog.cpp" line="111"/> - <source>%1 - copy</source> + <source>%name% - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="121"/> - <source>%1 - copy (%2)</source> + <location filename="../../FileIsSameDialog.cpp" line="118"/> + <source>%name% - copy (%number%)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="188"/> + <location filename="../../FileIsSameDialog.cpp" line="184"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="188"/> + <location filename="../../FileIsSameDialog.cpp" line="184"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -464,21 +464,21 @@ </message> <message> <location filename="../../FolderExistsDialog.cpp" line="122"/> - <source>%1 - copy</source> + <source>%name% - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="132"/> - <source>%1 - copy (%2)</source> + <location filename="../../FolderExistsDialog.cpp" line="131"/> + <source>%name% - copy (%number%)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="193"/> + <location filename="../../FolderExistsDialog.cpp" line="190"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="193"/> + <location filename="../../FolderExistsDialog.cpp" line="190"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -486,49 +486,49 @@ <context> <name>ListThread</name> <message> - <location filename="../../ListThread.cpp" line="1482"/> - <location filename="../../ListThread.cpp" line="2414"/> + <location filename="../../ListThread.cpp" line="1487"/> + <location filename="../../ListThread.cpp" line="2419"/> <source>Unable do to move or copy item into wrong forced mode: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1489"/> - <location filename="../../ListThread.cpp" line="2421"/> + <location filename="../../ListThread.cpp" line="1494"/> + <location filename="../../ListThread.cpp" line="2426"/> <source>Unable to save the transfer list: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1505"/> + <location filename="../../ListThread.cpp" line="1510"/> <source>Problem reading file, or file-size is 0</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1512"/> + <location filename="../../ListThread.cpp" line="1517"/> <source>Wrong header: "%1"</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1521"/> + <location filename="../../ListThread.cpp" line="1526"/> <source>The transfer list is in mixed mode, but this instance is not in this mode</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1530"/> + <location filename="../../ListThread.cpp" line="1535"/> <source>The transfer list is in copy mode, but this instance is not in this mode</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1536"/> + <location filename="../../ListThread.cpp" line="1541"/> <source>The transfer list is in move mode, but this instance is not in this mode</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1599"/> + <location filename="../../ListThread.cpp" line="1604"/> <source>Some errors have been found during the line parsing</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1607"/> + <location filename="../../ListThread.cpp" line="1612"/> <source>Unable to open the transfer list: %1</source> <translation type="unfinished"></translation> </message> @@ -570,24 +570,24 @@ <context> <name>ReadThread</name> <message> - <location filename="../../ReadThread.cpp" line="55"/> + <location filename="../../ReadThread.cpp" line="59"/> <source>Internal error, please report it!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ReadThread.cpp" line="184"/> + <location filename="../../ReadThread.cpp" line="188"/> <source>Internal error reading the source file:block size out of range</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ReadThread.cpp" line="192"/> - <location filename="../../ReadThread.cpp" line="408"/> + <location filename="../../ReadThread.cpp" line="196"/> + <location filename="../../ReadThread.cpp" line="420"/> <source>Unable to read the source file: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ReadThread.cpp" line="233"/> - <location filename="../../ReadThread.cpp" line="456"/> + <location filename="../../ReadThread.cpp" line="237"/> + <location filename="../../ReadThread.cpp" line="468"/> <source>File truncated during the read, possible data change</source> <translation type="unfinished"></translation> </message> @@ -595,37 +595,31 @@ <context> <name>RenamingRules</name> <message> - <location filename="../../RenamingRules.ui" line="26"/> + <location filename="../../RenamingRules.ui" line="35"/> <source>First renaming</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../RenamingRules.ui" line="32"/> - <source>%name% - copy</source> + <location filename="../../RenamingRules.ui" line="41"/> + <source>%name% - copy%suffix%</source> <extracomment>%name% should not be translated</extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../../RenamingRules.ui" line="39"/> - <source><html><head/><body><p>Variables: <span style=" font-weight:600;">%name%</span> for the original file name</p></body></html></source> - <extracomment> should not be translated</extracomment> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../RenamingRules.ui" line="49"/> - <source>Second renaming</source> + <location filename="../../RenamingRules.ui" line="57"/> + <source>%name% - copy (%number%)%suffix%</source> + <extracomment>%name%, %number% should not be translated</extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../../RenamingRules.ui" line="55"/> - <source>%name% - copy (%number%)</source> + <location filename="../../RenamingRules.ui" line="67"/> + <source><html><head/><body><p>Variables: <span style=" font-weight:600;">%name%</span> for the original file name, <span style=" font-weight:600;">%number%</span> for the extra number, <span style=" font-weight:600;">%suffix%</span> file suffix</p></body></html></source> <extracomment>%name%, %number% should not be translated</extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../../RenamingRules.ui" line="62"/> - <source><html><head/><body><p>Variables: <span style=" font-weight:600;">%name%</span> for the original file name</p><p><span style=" font-weight:600;">%number%</span> for the extra number</p></body></html></source> - <extracomment>%name%, %number% should not be translated</extracomment> + <location filename="../../RenamingRules.ui" line="51"/> + <source>Second renaming</source> <translation type="unfinished"></translation> </message> <message> @@ -655,33 +649,41 @@ </message> <message> <location filename="../../ScanFileOrFolder.cpp" line="338"/> - <location filename="../../ScanFileOrFolder.cpp" line="404"/> <source>%1 - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="348"/> - <location filename="../../ScanFileOrFolder.cpp" line="414"/> + <location filename="../../ScanFileOrFolder.cpp" line="345"/> <source>%1 - copy (%2)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="452"/> + <location filename="../../ScanFileOrFolder.cpp" line="401"/> + <source>%name% - copy</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../ScanFileOrFolder.cpp" line="408"/> + <source>%name% - copy (%number%)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../ScanFileOrFolder.cpp" line="444"/> <source>This is not a folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="454"/> + <location filename="../../ScanFileOrFolder.cpp" line="446"/> <source>The folder does exists</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="456"/> + <location filename="../../ScanFileOrFolder.cpp" line="448"/> <source>The folder is not readable</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="467"/> + <location filename="../../ScanFileOrFolder.cpp" line="459"/> <source>Problem with name encoding</source> <translation type="unfinished"></translation> </message> @@ -690,9 +692,9 @@ <name>TransferThread</name> <message> <location filename="../../TransferThread.cpp" line="244"/> - <location filename="../../TransferThread.cpp" line="677"/> - <location filename="../../TransferThread.cpp" line="749"/> - <location filename="../../TransferThread.cpp" line="1319"/> + <location filename="../../TransferThread.cpp" line="673"/> + <location filename="../../TransferThread.cpp" line="745"/> + <location filename="../../TransferThread.cpp" line="1315"/> <source>File not found</source> <translation type="unfinished"></translation> </message> @@ -725,60 +727,60 @@ </message> <message> <location filename="../../TransferThread.cpp" line="645"/> - <source>%1 - copy</source> + <source>%name% - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="655"/> - <source>%1 - copy (%2)</source> + <location filename="../../TransferThread.cpp" line="652"/> + <source>%name% - copy (%number%)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="715"/> - <location filename="../../TransferThread.cpp" line="830"/> + <location filename="../../TransferThread.cpp" line="711"/> + <location filename="../../TransferThread.cpp" line="826"/> <source>The source file doesn't exist</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="755"/> - <location filename="../../TransferThread.cpp" line="842"/> + <location filename="../../TransferThread.cpp" line="751"/> + <location filename="../../TransferThread.cpp" line="838"/> <source>Unable to do the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="791"/> + <location filename="../../TransferThread.cpp" line="787"/> <source>The source doesn't exist</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="836"/> + <location filename="../../TransferThread.cpp" line="832"/> <source>Another file exists at same place</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1138"/> + <location filename="../../TransferThread.cpp" line="1134"/> <source>The checksums do not match</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1228"/> + <location filename="../../TransferThread.cpp" line="1224"/> <source>Internal error: The destination is not closed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1243"/> + <location filename="../../TransferThread.cpp" line="1239"/> <source>Internal error: The size transfered doesn't match</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1254"/> + <location filename="../../TransferThread.cpp" line="1250"/> <source>Internal error: The buffer is not empty</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1319"/> - <location filename="../../TransferThread.cpp" line="1337"/> - <location filename="../../TransferThread.cpp" line="1352"/> + <location filename="../../TransferThread.cpp" line="1315"/> + <location filename="../../TransferThread.cpp" line="1333"/> + <location filename="../../TransferThread.cpp" line="1348"/> <source>Unable to change the date</source> <translation type="unfinished"></translation> </message> @@ -791,22 +793,22 @@ <context> <name>WriteThread</name> <message> - <location filename="../../WriteThread.cpp" line="80"/> + <location filename="../../WriteThread.cpp" line="83"/> <source>Path resolution error (Empty path)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../WriteThread.cpp" line="269"/> + <location filename="../../WriteThread.cpp" line="277"/> <source>Internal error, please report it!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../WriteThread.cpp" line="672"/> + <location filename="../../WriteThread.cpp" line="680"/> <source>Unable to read the source file: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../WriteThread.cpp" line="697"/> + <location filename="../../WriteThread.cpp" line="705"/> <source>File truncated during read, possible data change</source> <translation type="unfinished"></translation> </message> @@ -814,198 +816,198 @@ <context> <name>copyEngineOptions</name> <message> - <location filename="../../copyEngineOptions.ui" line="35"/> + <location filename="../../copyEngineOptions.ui" line="44"/> <source>Transfer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="44"/> + <location filename="../../copyEngineOptions.ui" line="53"/> <source>Move the whole folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="51"/> + <location filename="../../copyEngineOptions.ui" line="60"/> <source>Transfer the file rights</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="61"/> + <location filename="../../copyEngineOptions.ui" line="70"/> <source>Keep the file date</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="74"/> + <location filename="../../copyEngineOptions.ui" line="83"/> <source>Autostart the transfer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="81"/> - <location filename="../../copyEngineOptions.ui" line="101"/> + <location filename="../../copyEngineOptions.ui" line="90"/> + <location filename="../../copyEngineOptions.ui" line="110"/> <source>Less performance if checked</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="104"/> + <location filename="../../copyEngineOptions.ui" line="113"/> <source>Follow the strict order</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="130"/> + <location filename="../../copyEngineOptions.ui" line="139"/> <source>Error and collision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="136"/> + <location filename="../../copyEngineOptions.ui" line="145"/> <source>When folder error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="146"/> + <location filename="../../copyEngineOptions.ui" line="155"/> <source>When file error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="172"/> + <location filename="../../copyEngineOptions.ui" line="181"/> <source>When file collision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="232"/> + <location filename="../../copyEngineOptions.ui" line="241"/> <source>When folder collision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="263"/> + <location filename="../../copyEngineOptions.ui" line="272"/> <source>Check if destination folder exists</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="270"/> + <location filename="../../copyEngineOptions.ui" line="279"/> <source>Renaming rules</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="290"/> + <location filename="../../copyEngineOptions.ui" line="299"/> <source>Delete partially transferred files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="303"/> + <location filename="../../copyEngineOptions.ui" line="312"/> <source>Rename the original destination</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="334"/> + <location filename="../../copyEngineOptions.ui" line="343"/> <source>Control</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="340"/> + <location filename="../../copyEngineOptions.ui" line="349"/> <source>Checksum</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="349"/> + <location filename="../../copyEngineOptions.ui" line="358"/> <source>Only after error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="356"/> + <location filename="../../copyEngineOptions.ui" line="365"/> <source>Ignore if impossible</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="373"/> + <location filename="../../copyEngineOptions.ui" line="382"/> <source>Verify checksums</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="405"/> + <location filename="../../copyEngineOptions.ui" line="414"/> <source>Performance</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="411"/> + <location filename="../../copyEngineOptions.ui" line="420"/> <source>Parallel buffer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="418"/> - <location filename="../../copyEngineOptions.ui" line="431"/> - <location filename="../../copyEngineOptions.ui" line="444"/> - <location filename="../../copyEngineOptions.ui" line="481"/> - <location filename="../../copyEngineOptions.ui" line="550"/> + <location filename="../../copyEngineOptions.ui" line="427"/> + <location filename="../../copyEngineOptions.ui" line="440"/> + <location filename="../../copyEngineOptions.ui" line="453"/> + <location filename="../../copyEngineOptions.ui" line="490"/> + <location filename="../../copyEngineOptions.ui" line="559"/> <source>KB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="460"/> + <location filename="../../copyEngineOptions.ui" line="469"/> <source>Block size</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="467"/> + <location filename="../../copyEngineOptions.ui" line="476"/> <source>Sequential buffer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="474"/> + <location filename="../../copyEngineOptions.ui" line="483"/> <source>Enable OS buffer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="497"/> + <location filename="../../copyEngineOptions.ui" line="506"/> <source>OS buffer only if smaller than</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="504"/> + <location filename="../../copyEngineOptions.ui" line="513"/> <source>Transfer algorithm</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="543"/> + <location filename="../../copyEngineOptions.ui" line="552"/> <source>Parallelize if smaller than</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="573"/> - <source>Inode threads</source> + <location filename="../../copyEngineOptions.ui" line="582"/> + <source>Inode threads (unsafe > 1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="580"/> - <location filename="../../copyEngineOptions.ui" line="590"/> + <location filename="../../copyEngineOptions.ui" line="589"/> + <location filename="../../copyEngineOptions.ui" line="599"/> <source>More cpu, but better organisation on the disk</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="593"/> + <location filename="../../copyEngineOptions.ui" line="602"/> <source>Order the list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="609"/> + <location filename="../../copyEngineOptions.ui" line="618"/> <source>Misc</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="615"/> + <location filename="../../copyEngineOptions.ui" line="624"/> <source>Check the disk space</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="625"/> + <location filename="../../copyEngineOptions.ui" line="634"/> <source>Use this folder when destination is not set</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="637"/> + <location filename="../../copyEngineOptions.ui" line="646"/> <source>Browse</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="659"/> + <location filename="../../copyEngineOptions.ui" line="668"/> <source>Filters</source> <translation type="unfinished"></translation> </message> diff --git a/plugins/CopyEngine/Ultracopier/Languages/it/translation.ts b/plugins/CopyEngine/Ultracopier/Languages/it/translation.ts index 2a4f172..cba024c 100644 --- a/plugins/CopyEngine/Ultracopier/Languages/it/translation.ts +++ b/plugins/CopyEngine/Ultracopier/Languages/it/translation.ts @@ -146,85 +146,85 @@ <context> <name>CopyEngineFactory</name> <message> - <location filename="../../CopyEngineFactory.cpp" line="419"/> - <location filename="../../CopyEngineFactory.cpp" line="422"/> <location filename="../../CopyEngineFactory.cpp" line="427"/> - <location filename="../../CopyEngineFactory.cpp" line="431"/> + <location filename="../../CopyEngineFactory.cpp" line="430"/> + <location filename="../../CopyEngineFactory.cpp" line="435"/> + <location filename="../../CopyEngineFactory.cpp" line="439"/> <source>Ask</source> <translation>Chiedi</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="420"/> - <location filename="../../CopyEngineFactory.cpp" line="424"/> <location filename="../../CopyEngineFactory.cpp" line="428"/> <location filename="../../CopyEngineFactory.cpp" line="432"/> + <location filename="../../CopyEngineFactory.cpp" line="436"/> + <location filename="../../CopyEngineFactory.cpp" line="440"/> <source>Skip</source> <translation>Salta</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="423"/> + <location filename="../../CopyEngineFactory.cpp" line="431"/> <source>Merge</source> <translation>Unisci</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="425"/> - <location filename="../../CopyEngineFactory.cpp" line="437"/> + <location filename="../../CopyEngineFactory.cpp" line="433"/> + <location filename="../../CopyEngineFactory.cpp" line="445"/> <source>Rename</source> <translation>Rinomina</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="429"/> + <location filename="../../CopyEngineFactory.cpp" line="437"/> <source>Put at the end</source> <translation>Metti in coda</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="433"/> + <location filename="../../CopyEngineFactory.cpp" line="441"/> <source>Overwrite</source> <translation>Sovrascrivi</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="434"/> + <location filename="../../CopyEngineFactory.cpp" line="442"/> <source>Overwrite if different</source> <translation>Sovrascrivi se differente</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="435"/> + <location filename="../../CopyEngineFactory.cpp" line="443"/> <source>Overwrite if newer</source> <translation>Sovrascrivi se più recente</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="436"/> + <location filename="../../CopyEngineFactory.cpp" line="444"/> <source>Overwrite if older</source> <translation>Sovrascrivi se meno recente</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="439"/> + <location filename="../../CopyEngineFactory.cpp" line="447"/> <source>Automatic</source> <translation>Automatico</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="440"/> + <location filename="../../CopyEngineFactory.cpp" line="448"/> <source>Sequential</source> <translation>Sequenziale</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="441"/> + <location filename="../../CopyEngineFactory.cpp" line="449"/> <source>Parallel</source> <translation>Parallelo</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="492"/> - <location filename="../../CopyEngineFactory.cpp" line="531"/> + <location filename="../../CopyEngineFactory.cpp" line="500"/> + <location filename="../../CopyEngineFactory.cpp" line="539"/> <source>Options error</source> <translation>Opzioni di errore</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="492"/> + <location filename="../../CopyEngineFactory.cpp" line="500"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="531"/> + <location filename="../../CopyEngineFactory.cpp" line="539"/> <source>Options engine is not loaded, can't access to the filters</source> <translation>Le opzioni del motore per la copia non vengono caricate, impossibile accedere ai filtri</translation> </message> @@ -274,21 +274,21 @@ <name>FileExistsDialog</name> <message> <location filename="../../FileExistsDialog.cpp" line="137"/> - <source>%1 - copy</source> - <translation>%1 - copia</translation> + <source>%name% - copy%suffix%</source> + <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="147"/> - <source>%1 - copy (%2)</source> - <translation>%1 - copia (%2)</translation> + <location filename="../../FileExistsDialog.cpp" line="144"/> + <source>%name% - copy (%number%)%suffix%</source> + <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="232"/> + <location filename="../../FileExistsDialog.cpp" line="228"/> <source>Error</source> <translation>Errore</translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="232"/> + <location filename="../../FileExistsDialog.cpp" line="228"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -297,21 +297,21 @@ <name>FileIsSameDialog</name> <message> <location filename="../../FileIsSameDialog.cpp" line="111"/> - <source>%1 - copy</source> - <translation>%1 - copia</translation> + <source>%name% - copy</source> + <translation type="unfinished">Copia di %name%</translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="121"/> - <source>%1 - copy (%2)</source> - <translation>%1 - copia (%2)</translation> + <location filename="../../FileIsSameDialog.cpp" line="118"/> + <source>%name% - copy (%number%)</source> + <translation type="unfinished">Copia di %name% (%number%)</translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="188"/> + <location filename="../../FileIsSameDialog.cpp" line="184"/> <source>Error</source> <translation>Errore</translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="188"/> + <location filename="../../FileIsSameDialog.cpp" line="184"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -467,21 +467,21 @@ </message> <message> <location filename="../../FolderExistsDialog.cpp" line="122"/> - <source>%1 - copy</source> - <translation>%1 - copia</translation> + <source>%name% - copy</source> + <translation type="unfinished">Copia di %name%</translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="132"/> - <source>%1 - copy (%2)</source> - <translation>%1 - copia (%2)</translation> + <location filename="../../FolderExistsDialog.cpp" line="131"/> + <source>%name% - copy (%number%)</source> + <translation type="unfinished">Copia di %name% (%number%)</translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="193"/> + <location filename="../../FolderExistsDialog.cpp" line="190"/> <source>Error</source> <translation>Errore</translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="193"/> + <location filename="../../FolderExistsDialog.cpp" line="190"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -489,50 +489,50 @@ <context> <name>ListThread</name> <message> - <location filename="../../ListThread.cpp" line="1482"/> - <location filename="../../ListThread.cpp" line="2414"/> + <location filename="../../ListThread.cpp" line="1487"/> + <location filename="../../ListThread.cpp" line="2419"/> <source>Unable do to move or copy item into wrong forced mode: %1</source> <translation>Impossibile spostare o copiare elementi in modalità forzata anomala: %1</translation> </message> <message> - <location filename="../../ListThread.cpp" line="1489"/> - <location filename="../../ListThread.cpp" line="2421"/> + <location filename="../../ListThread.cpp" line="1494"/> + <location filename="../../ListThread.cpp" line="2426"/> <source>Unable to save the transfer list: %1</source> <translation>Impossibile salvare la lista dei trasferimenti: %1</translation> </message> <message> - <location filename="../../ListThread.cpp" line="1505"/> + <location filename="../../ListThread.cpp" line="1510"/> <source>Problem reading file, or file-size is 0</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1512"/> + <location filename="../../ListThread.cpp" line="1517"/> <source>Wrong header: "%1"</source> <translatorcomment>Header si riferisce all'intestazione?</translatorcomment> <translation>Intestazione sbagliata: "%1"</translation> </message> <message> - <location filename="../../ListThread.cpp" line="1521"/> + <location filename="../../ListThread.cpp" line="1526"/> <source>The transfer list is in mixed mode, but this instance is not in this mode</source> <translation>La lista dei trasferimenti è in modalità mista, ma questa istanza non è in questa modalità</translation> </message> <message> - <location filename="../../ListThread.cpp" line="1530"/> + <location filename="../../ListThread.cpp" line="1535"/> <source>The transfer list is in copy mode, but this instance is not in this mode</source> <translation>La lista dei trasferimenti è in modalità di copia, ma questa istanza non è in questa modalità</translation> </message> <message> - <location filename="../../ListThread.cpp" line="1536"/> + <location filename="../../ListThread.cpp" line="1541"/> <source>The transfer list is in move mode, but this instance is not in this mode</source> <translation>La lista dei trasferimenti è in modalità di spostamento, ma questa istanza non è in questa modalità</translation> </message> <message> - <location filename="../../ListThread.cpp" line="1599"/> + <location filename="../../ListThread.cpp" line="1604"/> <source>Some errors have been found during the line parsing</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1607"/> + <location filename="../../ListThread.cpp" line="1612"/> <source>Unable to open the transfer list: %1</source> <translation>Impossibile aprire la lista dei trasferimenti: %1</translation> </message> @@ -574,24 +574,24 @@ <context> <name>ReadThread</name> <message> - <location filename="../../ReadThread.cpp" line="55"/> + <location filename="../../ReadThread.cpp" line="59"/> <source>Internal error, please report it!</source> <translation>Errore interno, pregasi di segnalarlo!</translation> </message> <message> - <location filename="../../ReadThread.cpp" line="184"/> + <location filename="../../ReadThread.cpp" line="188"/> <source>Internal error reading the source file:block size out of range</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ReadThread.cpp" line="192"/> - <location filename="../../ReadThread.cpp" line="408"/> + <location filename="../../ReadThread.cpp" line="196"/> + <location filename="../../ReadThread.cpp" line="420"/> <source>Unable to read the source file: </source> <translation>Impossibile leggere il file di origine: </translation> </message> <message> - <location filename="../../ReadThread.cpp" line="233"/> - <location filename="../../ReadThread.cpp" line="456"/> + <location filename="../../ReadThread.cpp" line="237"/> + <location filename="../../ReadThread.cpp" line="468"/> <source>File truncated during the read, possible data change</source> <translation>File troncato durante la lettura, possibili variazioni di dati</translation> </message> @@ -599,44 +599,34 @@ <context> <name>RenamingRules</name> <message> - <location filename="../../RenamingRules.ui" line="26"/> + <location filename="../../RenamingRules.ui" line="35"/> <source>First renaming</source> <translatorcomment>o Prima ridenominazione?</translatorcomment> <translation>Prima rinomina</translation> </message> <message> - <location filename="../../RenamingRules.ui" line="32"/> - <source>%name% - copy</source> + <location filename="../../RenamingRules.ui" line="41"/> + <source>%name% - copy%suffix%</source> <extracomment>%name% should not be translated</extracomment> - <translatorcomment>%name% non dovrà essere tradotto</translatorcomment> - <translation>Copia di %name%</translation> - </message> - <message> - <location filename="../../RenamingRules.ui" line="39"/> - <source><html><head/><body><p>Variables: <span style=" font-weight:600;">%name%</span> for the original file name</p></body></html></source> - <extracomment> should not be translated</extracomment> - <translatorcomment>o per il nome originale del file</translatorcomment> - <translation><html><head/><body><p>variabili: <span style=" font-weight:600;">%name%</span> per il nome del file di origine</p></body></html></translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="../../RenamingRules.ui" line="49"/> - <source>Second renaming</source> - <translatorcomment>o Seconda ridenominazione?</translatorcomment> - <translation>Seconda rinomina</translation> + <location filename="../../RenamingRules.ui" line="57"/> + <source>%name% - copy (%number%)%suffix%</source> + <extracomment>%name%, %number% should not be translated</extracomment> + <translation type="unfinished"></translation> </message> <message> - <location filename="../../RenamingRules.ui" line="55"/> - <source>%name% - copy (%number%)</source> + <location filename="../../RenamingRules.ui" line="67"/> + <source><html><head/><body><p>Variables: <span style=" font-weight:600;">%name%</span> for the original file name, <span style=" font-weight:600;">%number%</span> for the extra number, <span style=" font-weight:600;">%suffix%</span> file suffix</p></body></html></source> <extracomment>%name%, %number% should not be translated</extracomment> - <translatorcomment>%name% e %number% non dovranno essere tradotti</translatorcomment> - <translation>Copia di %name% (%number%)</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="../../RenamingRules.ui" line="62"/> - <source><html><head/><body><p>Variables: <span style=" font-weight:600;">%name%</span> for the original file name</p><p><span style=" font-weight:600;">%number%</span> for the extra number</p></body></html></source> - <extracomment>%name%, %number% should not be translated</extracomment> - <translatorcomment>%name% e %number% non dovranno essere tradotti</translatorcomment> - <translation><html><head/><body><p>variabili: <span style=" font-weight:600;">%name%</span> per il nome del file di origine</p><p><span style=" font-weight:600;">%number%</span> per il numero progressivo</p></body></html></translation> + <location filename="../../RenamingRules.ui" line="51"/> + <source>Second renaming</source> + <translatorcomment>o Seconda ridenominazione?</translatorcomment> + <translation>Seconda rinomina</translation> </message> <message> <location filename="../../RenamingRules.cpp" line="39"/> @@ -665,33 +655,41 @@ </message> <message> <location filename="../../ScanFileOrFolder.cpp" line="338"/> - <location filename="../../ScanFileOrFolder.cpp" line="404"/> <source>%1 - copy</source> <translation>%1 - copia</translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="348"/> - <location filename="../../ScanFileOrFolder.cpp" line="414"/> + <location filename="../../ScanFileOrFolder.cpp" line="345"/> <source>%1 - copy (%2)</source> <translation>%1 - copia (%2)</translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="452"/> + <location filename="../../ScanFileOrFolder.cpp" line="401"/> + <source>%name% - copy</source> + <translation type="unfinished">Copia di %name%</translation> + </message> + <message> + <location filename="../../ScanFileOrFolder.cpp" line="408"/> + <source>%name% - copy (%number%)</source> + <translation type="unfinished">Copia di %name% (%number%)</translation> + </message> + <message> + <location filename="../../ScanFileOrFolder.cpp" line="444"/> <source>This is not a folder</source> <translation>Questa non è una cartella</translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="454"/> + <location filename="../../ScanFileOrFolder.cpp" line="446"/> <source>The folder does exists</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="456"/> + <location filename="../../ScanFileOrFolder.cpp" line="448"/> <source>The folder is not readable</source> <translation>La cartella non è leggibile</translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="467"/> + <location filename="../../ScanFileOrFolder.cpp" line="459"/> <source>Problem with name encoding</source> <translation>Problema con la codifica del nome</translation> </message> @@ -700,9 +698,9 @@ <name>TransferThread</name> <message> <location filename="../../TransferThread.cpp" line="244"/> - <location filename="../../TransferThread.cpp" line="677"/> - <location filename="../../TransferThread.cpp" line="749"/> - <location filename="../../TransferThread.cpp" line="1319"/> + <location filename="../../TransferThread.cpp" line="673"/> + <location filename="../../TransferThread.cpp" line="745"/> + <location filename="../../TransferThread.cpp" line="1315"/> <source>File not found</source> <translation>File non trovato</translation> </message> @@ -734,24 +732,14 @@ <translation type="unfinished">root</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="645"/> - <source>%1 - copy</source> - <translation type="unfinished">%1 - copia</translation> - </message> - <message> - <location filename="../../TransferThread.cpp" line="655"/> - <source>%1 - copy (%2)</source> - <translation type="unfinished">%1 - copia (%2)</translation> - </message> - <message> - <location filename="../../TransferThread.cpp" line="715"/> - <location filename="../../TransferThread.cpp" line="830"/> + <location filename="../../TransferThread.cpp" line="711"/> + <location filename="../../TransferThread.cpp" line="826"/> <source>The source file doesn't exist</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="755"/> - <location filename="../../TransferThread.cpp" line="842"/> + <location filename="../../TransferThread.cpp" line="751"/> + <location filename="../../TransferThread.cpp" line="838"/> <source>Unable to do the folder</source> <translation type="unfinished">Impossibile creare la cartella</translation> </message> @@ -761,39 +749,49 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="791"/> + <location filename="../../TransferThread.cpp" line="645"/> + <source>%name% - copy</source> + <translation type="unfinished">Copia di %name%</translation> + </message> + <message> + <location filename="../../TransferThread.cpp" line="652"/> + <source>%name% - copy (%number%)</source> + <translation type="unfinished">Copia di %name% (%number%)</translation> + </message> + <message> + <location filename="../../TransferThread.cpp" line="787"/> <source>The source doesn't exist</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="836"/> + <location filename="../../TransferThread.cpp" line="832"/> <source>Another file exists at same place</source> <translation type="unfinished">Nello stesso percorso è presente un altro file</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1138"/> + <location filename="../../TransferThread.cpp" line="1134"/> <source>The checksums do not match</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1228"/> + <location filename="../../TransferThread.cpp" line="1224"/> <source>Internal error: The destination is not closed</source> <translation type="unfinished">Errore interno: la cartella di destinazione non è chiusa</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1243"/> + <location filename="../../TransferThread.cpp" line="1239"/> <source>Internal error: The size transfered doesn't match</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1254"/> + <location filename="../../TransferThread.cpp" line="1250"/> <source>Internal error: The buffer is not empty</source> <translation type="unfinished">Errore interno: il buffer non è vuoto</translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1319"/> - <location filename="../../TransferThread.cpp" line="1337"/> - <location filename="../../TransferThread.cpp" line="1352"/> + <location filename="../../TransferThread.cpp" line="1315"/> + <location filename="../../TransferThread.cpp" line="1333"/> + <location filename="../../TransferThread.cpp" line="1348"/> <source>Unable to change the date</source> <translation type="unfinished">Impossibile cambiare la data</translation> </message> @@ -801,22 +799,22 @@ <context> <name>WriteThread</name> <message> - <location filename="../../WriteThread.cpp" line="80"/> + <location filename="../../WriteThread.cpp" line="83"/> <source>Path resolution error (Empty path)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../WriteThread.cpp" line="269"/> + <location filename="../../WriteThread.cpp" line="277"/> <source>Internal error, please report it!</source> <translation>Errore interno, pregasi di segnalarlo!</translation> </message> <message> - <location filename="../../WriteThread.cpp" line="672"/> + <location filename="../../WriteThread.cpp" line="680"/> <source>Unable to read the source file: </source> <translation>Impossibile leggere il file di origine: </translation> </message> <message> - <location filename="../../WriteThread.cpp" line="697"/> + <location filename="../../WriteThread.cpp" line="705"/> <source>File truncated during read, possible data change</source> <translation type="unfinished"></translation> </message> @@ -824,198 +822,198 @@ <context> <name>copyEngineOptions</name> <message> - <location filename="../../copyEngineOptions.ui" line="35"/> + <location filename="../../copyEngineOptions.ui" line="44"/> <source>Transfer</source> <translation>Trasferisci</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="44"/> + <location filename="../../copyEngineOptions.ui" line="53"/> <source>Move the whole folder</source> <translation>Spostare l'intera cartella</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="51"/> + <location filename="../../copyEngineOptions.ui" line="60"/> <source>Transfer the file rights</source> <translation>Trasferire le autorizzazioni dei file</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="61"/> + <location filename="../../copyEngineOptions.ui" line="70"/> <source>Keep the file date</source> <translation>Mantenere la data del file</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="74"/> + <location filename="../../copyEngineOptions.ui" line="83"/> <source>Autostart the transfer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="81"/> - <location filename="../../copyEngineOptions.ui" line="101"/> + <location filename="../../copyEngineOptions.ui" line="90"/> + <location filename="../../copyEngineOptions.ui" line="110"/> <source>Less performance if checked</source> <translation>Se selezionato si avranno prestazioni ridotte</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="104"/> + <location filename="../../copyEngineOptions.ui" line="113"/> <source>Follow the strict order</source> <translation>Seguire rigorosamente l'ordine</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="130"/> + <location filename="../../copyEngineOptions.ui" line="139"/> <source>Error and collision</source> <translation>Errori di coincidenze</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="136"/> + <location filename="../../copyEngineOptions.ui" line="145"/> <source>When folder error</source> <translation>Quando si verifica un errore nelle cartelle</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="146"/> + <location filename="../../copyEngineOptions.ui" line="155"/> <source>When file error</source> <translation>Quando si verifica un errore nei file</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="172"/> + <location filename="../../copyEngineOptions.ui" line="181"/> <source>When file collision</source> <translation>Quando i file coincidono</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="232"/> + <location filename="../../copyEngineOptions.ui" line="241"/> <source>When folder collision</source> <translation>Quando le cartelle coincidono</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="263"/> + <location filename="../../copyEngineOptions.ui" line="272"/> <source>Check if destination folder exists</source> <translation>Controllare se la cartella di destinazione esiste</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="270"/> + <location filename="../../copyEngineOptions.ui" line="279"/> <source>Renaming rules</source> <translation>Regole di rinomina</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="290"/> + <location filename="../../copyEngineOptions.ui" line="299"/> <source>Delete partially transferred files</source> <translation>Eliminare i file parzialmente trasferiti</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="303"/> + <location filename="../../copyEngineOptions.ui" line="312"/> <source>Rename the original destination</source> <translation>Rinominare la destinazione all'origine</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="334"/> + <location filename="../../copyEngineOptions.ui" line="343"/> <source>Control</source> <translation>Controllare</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="340"/> + <location filename="../../copyEngineOptions.ui" line="349"/> <source>Checksum</source> <translation>Codice di controllo (Checksum)</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="349"/> + <location filename="../../copyEngineOptions.ui" line="358"/> <source>Only after error</source> <translation>Solo dopo l'errore</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="356"/> + <location filename="../../copyEngineOptions.ui" line="365"/> <source>Ignore if impossible</source> <translation>Ignora se non corrisponde</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="373"/> + <location filename="../../copyEngineOptions.ui" line="382"/> <source>Verify checksums</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="405"/> + <location filename="../../copyEngineOptions.ui" line="414"/> <source>Performance</source> <translation>Prestazioni</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="411"/> + <location filename="../../copyEngineOptions.ui" line="420"/> <source>Parallel buffer</source> <translation>Buffer parallelo</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="418"/> - <location filename="../../copyEngineOptions.ui" line="431"/> - <location filename="../../copyEngineOptions.ui" line="444"/> - <location filename="../../copyEngineOptions.ui" line="481"/> - <location filename="../../copyEngineOptions.ui" line="550"/> + <location filename="../../copyEngineOptions.ui" line="427"/> + <location filename="../../copyEngineOptions.ui" line="440"/> + <location filename="../../copyEngineOptions.ui" line="453"/> + <location filename="../../copyEngineOptions.ui" line="490"/> + <location filename="../../copyEngineOptions.ui" line="559"/> <source>KB</source> <translation>KB</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="460"/> + <location filename="../../copyEngineOptions.ui" line="469"/> <source>Block size</source> <translation>Dimensione del blocco</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="467"/> + <location filename="../../copyEngineOptions.ui" line="476"/> <source>Sequential buffer</source> <translation>Buffer sequenziale</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="474"/> + <location filename="../../copyEngineOptions.ui" line="483"/> <source>Enable OS buffer</source> <translation>Attivare il buffer del sistema operativo</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="497"/> + <location filename="../../copyEngineOptions.ui" line="506"/> <source>OS buffer only if smaller than</source> <translation>Buffer del sistema operativo solo se inferiore a</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="504"/> + <location filename="../../copyEngineOptions.ui" line="513"/> <source>Transfer algorithm</source> <translation>Algoritmo di trasferimento </translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="543"/> + <location filename="../../copyEngineOptions.ui" line="552"/> <source>Parallelize if smaller than</source> <translation>Affiancare se inferiore a</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="573"/> - <source>Inode threads</source> - <translation>Inode threads</translation> + <location filename="../../copyEngineOptions.ui" line="582"/> + <source>Inode threads (unsafe > 1)</source> + <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="580"/> - <location filename="../../copyEngineOptions.ui" line="590"/> + <location filename="../../copyEngineOptions.ui" line="589"/> + <location filename="../../copyEngineOptions.ui" line="599"/> <source>More cpu, but better organisation on the disk</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="593"/> + <location filename="../../copyEngineOptions.ui" line="602"/> <source>Order the list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="609"/> + <location filename="../../copyEngineOptions.ui" line="618"/> <source>Misc</source> <translation>Varie</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="615"/> + <location filename="../../copyEngineOptions.ui" line="624"/> <source>Check the disk space</source> <translation>Controllare lo spazio su disco</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="625"/> + <location filename="../../copyEngineOptions.ui" line="634"/> <source>Use this folder when destination is not set</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="637"/> + <location filename="../../copyEngineOptions.ui" line="646"/> <source>Browse</source> <translation>Sfoglia</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="659"/> + <location filename="../../copyEngineOptions.ui" line="668"/> <source>Filters</source> <translation>Filtri</translation> </message> diff --git a/plugins/CopyEngine/Ultracopier/Languages/ja/translation.ts b/plugins/CopyEngine/Ultracopier/Languages/ja/translation.ts index f8a7792..19bfabd 100644 --- a/plugins/CopyEngine/Ultracopier/Languages/ja/translation.ts +++ b/plugins/CopyEngine/Ultracopier/Languages/ja/translation.ts @@ -146,85 +146,85 @@ <context> <name>CopyEngineFactory</name> <message> - <location filename="../../CopyEngineFactory.cpp" line="419"/> - <location filename="../../CopyEngineFactory.cpp" line="422"/> <location filename="../../CopyEngineFactory.cpp" line="427"/> - <location filename="../../CopyEngineFactory.cpp" line="431"/> + <location filename="../../CopyEngineFactory.cpp" line="430"/> + <location filename="../../CopyEngineFactory.cpp" line="435"/> + <location filename="../../CopyEngineFactory.cpp" line="439"/> <source>Ask</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="420"/> - <location filename="../../CopyEngineFactory.cpp" line="424"/> <location filename="../../CopyEngineFactory.cpp" line="428"/> <location filename="../../CopyEngineFactory.cpp" line="432"/> + <location filename="../../CopyEngineFactory.cpp" line="436"/> + <location filename="../../CopyEngineFactory.cpp" line="440"/> <source>Skip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="423"/> + <location filename="../../CopyEngineFactory.cpp" line="431"/> <source>Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="425"/> - <location filename="../../CopyEngineFactory.cpp" line="437"/> + <location filename="../../CopyEngineFactory.cpp" line="433"/> + <location filename="../../CopyEngineFactory.cpp" line="445"/> <source>Rename</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="429"/> + <location filename="../../CopyEngineFactory.cpp" line="437"/> <source>Put at the end</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="433"/> + <location filename="../../CopyEngineFactory.cpp" line="441"/> <source>Overwrite</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="434"/> + <location filename="../../CopyEngineFactory.cpp" line="442"/> <source>Overwrite if different</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="435"/> + <location filename="../../CopyEngineFactory.cpp" line="443"/> <source>Overwrite if newer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="436"/> + <location filename="../../CopyEngineFactory.cpp" line="444"/> <source>Overwrite if older</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="439"/> + <location filename="../../CopyEngineFactory.cpp" line="447"/> <source>Automatic</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="440"/> + <location filename="../../CopyEngineFactory.cpp" line="448"/> <source>Sequential</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="441"/> + <location filename="../../CopyEngineFactory.cpp" line="449"/> <source>Parallel</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="492"/> - <location filename="../../CopyEngineFactory.cpp" line="531"/> + <location filename="../../CopyEngineFactory.cpp" line="500"/> + <location filename="../../CopyEngineFactory.cpp" line="539"/> <source>Options error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="492"/> + <location filename="../../CopyEngineFactory.cpp" line="500"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="531"/> + <location filename="../../CopyEngineFactory.cpp" line="539"/> <source>Options engine is not loaded, can't access to the filters</source> <translation type="unfinished"></translation> </message> @@ -274,21 +274,21 @@ <name>FileExistsDialog</name> <message> <location filename="../../FileExistsDialog.cpp" line="137"/> - <source>%1 - copy</source> + <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="147"/> - <source>%1 - copy (%2)</source> + <location filename="../../FileExistsDialog.cpp" line="144"/> + <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="232"/> + <location filename="../../FileExistsDialog.cpp" line="228"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="232"/> + <location filename="../../FileExistsDialog.cpp" line="228"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -297,21 +297,21 @@ <name>FileIsSameDialog</name> <message> <location filename="../../FileIsSameDialog.cpp" line="111"/> - <source>%1 - copy</source> + <source>%name% - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="121"/> - <source>%1 - copy (%2)</source> + <location filename="../../FileIsSameDialog.cpp" line="118"/> + <source>%name% - copy (%number%)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="188"/> + <location filename="../../FileIsSameDialog.cpp" line="184"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="188"/> + <location filename="../../FileIsSameDialog.cpp" line="184"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -464,21 +464,21 @@ </message> <message> <location filename="../../FolderExistsDialog.cpp" line="122"/> - <source>%1 - copy</source> + <source>%name% - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="132"/> - <source>%1 - copy (%2)</source> + <location filename="../../FolderExistsDialog.cpp" line="131"/> + <source>%name% - copy (%number%)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="193"/> + <location filename="../../FolderExistsDialog.cpp" line="190"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="193"/> + <location filename="../../FolderExistsDialog.cpp" line="190"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -486,49 +486,49 @@ <context> <name>ListThread</name> <message> - <location filename="../../ListThread.cpp" line="1482"/> - <location filename="../../ListThread.cpp" line="2414"/> + <location filename="../../ListThread.cpp" line="1487"/> + <location filename="../../ListThread.cpp" line="2419"/> <source>Unable do to move or copy item into wrong forced mode: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1489"/> - <location filename="../../ListThread.cpp" line="2421"/> + <location filename="../../ListThread.cpp" line="1494"/> + <location filename="../../ListThread.cpp" line="2426"/> <source>Unable to save the transfer list: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1505"/> + <location filename="../../ListThread.cpp" line="1510"/> <source>Problem reading file, or file-size is 0</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1512"/> + <location filename="../../ListThread.cpp" line="1517"/> <source>Wrong header: "%1"</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1521"/> + <location filename="../../ListThread.cpp" line="1526"/> <source>The transfer list is in mixed mode, but this instance is not in this mode</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1530"/> + <location filename="../../ListThread.cpp" line="1535"/> <source>The transfer list is in copy mode, but this instance is not in this mode</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1536"/> + <location filename="../../ListThread.cpp" line="1541"/> <source>The transfer list is in move mode, but this instance is not in this mode</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1599"/> + <location filename="../../ListThread.cpp" line="1604"/> <source>Some errors have been found during the line parsing</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1607"/> + <location filename="../../ListThread.cpp" line="1612"/> <source>Unable to open the transfer list: %1</source> <translation type="unfinished"></translation> </message> @@ -570,24 +570,24 @@ <context> <name>ReadThread</name> <message> - <location filename="../../ReadThread.cpp" line="55"/> + <location filename="../../ReadThread.cpp" line="59"/> <source>Internal error, please report it!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ReadThread.cpp" line="184"/> + <location filename="../../ReadThread.cpp" line="188"/> <source>Internal error reading the source file:block size out of range</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ReadThread.cpp" line="192"/> - <location filename="../../ReadThread.cpp" line="408"/> + <location filename="../../ReadThread.cpp" line="196"/> + <location filename="../../ReadThread.cpp" line="420"/> <source>Unable to read the source file: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ReadThread.cpp" line="233"/> - <location filename="../../ReadThread.cpp" line="456"/> + <location filename="../../ReadThread.cpp" line="237"/> + <location filename="../../ReadThread.cpp" line="468"/> <source>File truncated during the read, possible data change</source> <translation type="unfinished"></translation> </message> @@ -600,37 +600,31 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../RenamingRules.ui" line="26"/> + <location filename="../../RenamingRules.ui" line="35"/> <source>First renaming</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../RenamingRules.ui" line="32"/> - <source>%name% - copy</source> + <location filename="../../RenamingRules.ui" line="41"/> + <source>%name% - copy%suffix%</source> <extracomment>%name% should not be translated</extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../../RenamingRules.ui" line="39"/> - <source><html><head/><body><p>Variables: <span style=" font-weight:600;">%name%</span> for the original file name</p></body></html></source> - <extracomment> should not be translated</extracomment> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../RenamingRules.ui" line="49"/> - <source>Second renaming</source> + <location filename="../../RenamingRules.ui" line="57"/> + <source>%name% - copy (%number%)%suffix%</source> + <extracomment>%name%, %number% should not be translated</extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../../RenamingRules.ui" line="55"/> - <source>%name% - copy (%number%)</source> + <location filename="../../RenamingRules.ui" line="67"/> + <source><html><head/><body><p>Variables: <span style=" font-weight:600;">%name%</span> for the original file name, <span style=" font-weight:600;">%number%</span> for the extra number, <span style=" font-weight:600;">%suffix%</span> file suffix</p></body></html></source> <extracomment>%name%, %number% should not be translated</extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../../RenamingRules.ui" line="62"/> - <source><html><head/><body><p>Variables: <span style=" font-weight:600;">%name%</span> for the original file name</p><p><span style=" font-weight:600;">%number%</span> for the extra number</p></body></html></source> - <extracomment>%name%, %number% should not be translated</extracomment> + <location filename="../../RenamingRules.ui" line="51"/> + <source>Second renaming</source> <translation type="unfinished"></translation> </message> <message> @@ -655,33 +649,41 @@ </message> <message> <location filename="../../ScanFileOrFolder.cpp" line="338"/> - <location filename="../../ScanFileOrFolder.cpp" line="404"/> <source>%1 - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="348"/> - <location filename="../../ScanFileOrFolder.cpp" line="414"/> + <location filename="../../ScanFileOrFolder.cpp" line="345"/> <source>%1 - copy (%2)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="452"/> + <location filename="../../ScanFileOrFolder.cpp" line="401"/> + <source>%name% - copy</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../ScanFileOrFolder.cpp" line="408"/> + <source>%name% - copy (%number%)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../ScanFileOrFolder.cpp" line="444"/> <source>This is not a folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="454"/> + <location filename="../../ScanFileOrFolder.cpp" line="446"/> <source>The folder does exists</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="456"/> + <location filename="../../ScanFileOrFolder.cpp" line="448"/> <source>The folder is not readable</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="467"/> + <location filename="../../ScanFileOrFolder.cpp" line="459"/> <source>Problem with name encoding</source> <translation type="unfinished"></translation> </message> @@ -690,9 +692,9 @@ <name>TransferThread</name> <message> <location filename="../../TransferThread.cpp" line="244"/> - <location filename="../../TransferThread.cpp" line="677"/> - <location filename="../../TransferThread.cpp" line="749"/> - <location filename="../../TransferThread.cpp" line="1319"/> + <location filename="../../TransferThread.cpp" line="673"/> + <location filename="../../TransferThread.cpp" line="745"/> + <location filename="../../TransferThread.cpp" line="1315"/> <source>File not found</source> <translation type="unfinished"></translation> </message> @@ -725,60 +727,60 @@ </message> <message> <location filename="../../TransferThread.cpp" line="645"/> - <source>%1 - copy</source> + <source>%name% - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="655"/> - <source>%1 - copy (%2)</source> + <location filename="../../TransferThread.cpp" line="652"/> + <source>%name% - copy (%number%)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="715"/> - <location filename="../../TransferThread.cpp" line="830"/> + <location filename="../../TransferThread.cpp" line="711"/> + <location filename="../../TransferThread.cpp" line="826"/> <source>The source file doesn't exist</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="755"/> - <location filename="../../TransferThread.cpp" line="842"/> + <location filename="../../TransferThread.cpp" line="751"/> + <location filename="../../TransferThread.cpp" line="838"/> <source>Unable to do the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="791"/> + <location filename="../../TransferThread.cpp" line="787"/> <source>The source doesn't exist</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="836"/> + <location filename="../../TransferThread.cpp" line="832"/> <source>Another file exists at same place</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1138"/> + <location filename="../../TransferThread.cpp" line="1134"/> <source>The checksums do not match</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1228"/> + <location filename="../../TransferThread.cpp" line="1224"/> <source>Internal error: The destination is not closed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1243"/> + <location filename="../../TransferThread.cpp" line="1239"/> <source>Internal error: The size transfered doesn't match</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1254"/> + <location filename="../../TransferThread.cpp" line="1250"/> <source>Internal error: The buffer is not empty</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1319"/> - <location filename="../../TransferThread.cpp" line="1337"/> - <location filename="../../TransferThread.cpp" line="1352"/> + <location filename="../../TransferThread.cpp" line="1315"/> + <location filename="../../TransferThread.cpp" line="1333"/> + <location filename="../../TransferThread.cpp" line="1348"/> <source>Unable to change the date</source> <translation type="unfinished"></translation> </message> @@ -791,22 +793,22 @@ <context> <name>WriteThread</name> <message> - <location filename="../../WriteThread.cpp" line="80"/> + <location filename="../../WriteThread.cpp" line="83"/> <source>Path resolution error (Empty path)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../WriteThread.cpp" line="269"/> + <location filename="../../WriteThread.cpp" line="277"/> <source>Internal error, please report it!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../WriteThread.cpp" line="672"/> + <location filename="../../WriteThread.cpp" line="680"/> <source>Unable to read the source file: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../WriteThread.cpp" line="697"/> + <location filename="../../WriteThread.cpp" line="705"/> <source>File truncated during read, possible data change</source> <translation type="unfinished"></translation> </message> @@ -814,198 +816,198 @@ <context> <name>copyEngineOptions</name> <message> - <location filename="../../copyEngineOptions.ui" line="35"/> + <location filename="../../copyEngineOptions.ui" line="44"/> <source>Transfer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="44"/> + <location filename="../../copyEngineOptions.ui" line="53"/> <source>Move the whole folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="51"/> + <location filename="../../copyEngineOptions.ui" line="60"/> <source>Transfer the file rights</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="61"/> + <location filename="../../copyEngineOptions.ui" line="70"/> <source>Keep the file date</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="74"/> + <location filename="../../copyEngineOptions.ui" line="83"/> <source>Autostart the transfer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="81"/> - <location filename="../../copyEngineOptions.ui" line="101"/> + <location filename="../../copyEngineOptions.ui" line="90"/> + <location filename="../../copyEngineOptions.ui" line="110"/> <source>Less performance if checked</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="104"/> + <location filename="../../copyEngineOptions.ui" line="113"/> <source>Follow the strict order</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="130"/> + <location filename="../../copyEngineOptions.ui" line="139"/> <source>Error and collision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="136"/> + <location filename="../../copyEngineOptions.ui" line="145"/> <source>When folder error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="146"/> + <location filename="../../copyEngineOptions.ui" line="155"/> <source>When file error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="172"/> + <location filename="../../copyEngineOptions.ui" line="181"/> <source>When file collision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="232"/> + <location filename="../../copyEngineOptions.ui" line="241"/> <source>When folder collision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="263"/> + <location filename="../../copyEngineOptions.ui" line="272"/> <source>Check if destination folder exists</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="270"/> + <location filename="../../copyEngineOptions.ui" line="279"/> <source>Renaming rules</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="290"/> + <location filename="../../copyEngineOptions.ui" line="299"/> <source>Delete partially transferred files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="303"/> + <location filename="../../copyEngineOptions.ui" line="312"/> <source>Rename the original destination</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="334"/> + <location filename="../../copyEngineOptions.ui" line="343"/> <source>Control</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="340"/> + <location filename="../../copyEngineOptions.ui" line="349"/> <source>Checksum</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="349"/> + <location filename="../../copyEngineOptions.ui" line="358"/> <source>Only after error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="356"/> + <location filename="../../copyEngineOptions.ui" line="365"/> <source>Ignore if impossible</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="373"/> + <location filename="../../copyEngineOptions.ui" line="382"/> <source>Verify checksums</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="405"/> + <location filename="../../copyEngineOptions.ui" line="414"/> <source>Performance</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="411"/> + <location filename="../../copyEngineOptions.ui" line="420"/> <source>Parallel buffer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="418"/> - <location filename="../../copyEngineOptions.ui" line="431"/> - <location filename="../../copyEngineOptions.ui" line="444"/> - <location filename="../../copyEngineOptions.ui" line="481"/> - <location filename="../../copyEngineOptions.ui" line="550"/> + <location filename="../../copyEngineOptions.ui" line="427"/> + <location filename="../../copyEngineOptions.ui" line="440"/> + <location filename="../../copyEngineOptions.ui" line="453"/> + <location filename="../../copyEngineOptions.ui" line="490"/> + <location filename="../../copyEngineOptions.ui" line="559"/> <source>KB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="460"/> + <location filename="../../copyEngineOptions.ui" line="469"/> <source>Block size</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="467"/> + <location filename="../../copyEngineOptions.ui" line="476"/> <source>Sequential buffer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="474"/> + <location filename="../../copyEngineOptions.ui" line="483"/> <source>Enable OS buffer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="497"/> + <location filename="../../copyEngineOptions.ui" line="506"/> <source>OS buffer only if smaller than</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="504"/> + <location filename="../../copyEngineOptions.ui" line="513"/> <source>Transfer algorithm</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="543"/> + <location filename="../../copyEngineOptions.ui" line="552"/> <source>Parallelize if smaller than</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="573"/> - <source>Inode threads</source> + <location filename="../../copyEngineOptions.ui" line="582"/> + <source>Inode threads (unsafe > 1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="580"/> - <location filename="../../copyEngineOptions.ui" line="590"/> + <location filename="../../copyEngineOptions.ui" line="589"/> + <location filename="../../copyEngineOptions.ui" line="599"/> <source>More cpu, but better organisation on the disk</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="593"/> + <location filename="../../copyEngineOptions.ui" line="602"/> <source>Order the list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="609"/> + <location filename="../../copyEngineOptions.ui" line="618"/> <source>Misc</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="615"/> + <location filename="../../copyEngineOptions.ui" line="624"/> <source>Check the disk space</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="625"/> + <location filename="../../copyEngineOptions.ui" line="634"/> <source>Use this folder when destination is not set</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="637"/> + <location filename="../../copyEngineOptions.ui" line="646"/> <source>Browse</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="659"/> + <location filename="../../copyEngineOptions.ui" line="668"/> <source>Filters</source> <translation type="unfinished"></translation> </message> diff --git a/plugins/CopyEngine/Ultracopier/Languages/ko/translation.ts b/plugins/CopyEngine/Ultracopier/Languages/ko/translation.ts index 8972a9e..7698857 100644 --- a/plugins/CopyEngine/Ultracopier/Languages/ko/translation.ts +++ b/plugins/CopyEngine/Ultracopier/Languages/ko/translation.ts @@ -146,85 +146,85 @@ <context> <name>CopyEngineFactory</name> <message> - <location filename="../../CopyEngineFactory.cpp" line="419"/> - <location filename="../../CopyEngineFactory.cpp" line="422"/> <location filename="../../CopyEngineFactory.cpp" line="427"/> - <location filename="../../CopyEngineFactory.cpp" line="431"/> + <location filename="../../CopyEngineFactory.cpp" line="430"/> + <location filename="../../CopyEngineFactory.cpp" line="435"/> + <location filename="../../CopyEngineFactory.cpp" line="439"/> <source>Ask</source> <translation type="unfinished">확인</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="420"/> - <location filename="../../CopyEngineFactory.cpp" line="424"/> <location filename="../../CopyEngineFactory.cpp" line="428"/> <location filename="../../CopyEngineFactory.cpp" line="432"/> + <location filename="../../CopyEngineFactory.cpp" line="436"/> + <location filename="../../CopyEngineFactory.cpp" line="440"/> <source>Skip</source> <translation type="unfinished">건너뛰기</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="423"/> + <location filename="../../CopyEngineFactory.cpp" line="431"/> <source>Merge</source> <translation type="unfinished">합치기</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="425"/> - <location filename="../../CopyEngineFactory.cpp" line="437"/> + <location filename="../../CopyEngineFactory.cpp" line="433"/> + <location filename="../../CopyEngineFactory.cpp" line="445"/> <source>Rename</source> <translation type="unfinished">이름 바꾸기</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="429"/> + <location filename="../../CopyEngineFactory.cpp" line="437"/> <source>Put at the end</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="433"/> + <location filename="../../CopyEngineFactory.cpp" line="441"/> <source>Overwrite</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="434"/> + <location filename="../../CopyEngineFactory.cpp" line="442"/> <source>Overwrite if different</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="435"/> + <location filename="../../CopyEngineFactory.cpp" line="443"/> <source>Overwrite if newer</source> <translation type="unfinished">더 최신이면 덮어씌우기</translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="436"/> + <location filename="../../CopyEngineFactory.cpp" line="444"/> <source>Overwrite if older</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="439"/> + <location filename="../../CopyEngineFactory.cpp" line="447"/> <source>Automatic</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="440"/> + <location filename="../../CopyEngineFactory.cpp" line="448"/> <source>Sequential</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="441"/> + <location filename="../../CopyEngineFactory.cpp" line="449"/> <source>Parallel</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="492"/> - <location filename="../../CopyEngineFactory.cpp" line="531"/> + <location filename="../../CopyEngineFactory.cpp" line="500"/> + <location filename="../../CopyEngineFactory.cpp" line="539"/> <source>Options error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="492"/> + <location filename="../../CopyEngineFactory.cpp" line="500"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="531"/> + <location filename="../../CopyEngineFactory.cpp" line="539"/> <source>Options engine is not loaded, can't access to the filters</source> <translation type="unfinished"></translation> </message> @@ -274,21 +274,21 @@ <name>FileExistsDialog</name> <message> <location filename="../../FileExistsDialog.cpp" line="137"/> - <source>%1 - copy</source> + <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="147"/> - <source>%1 - copy (%2)</source> + <location filename="../../FileExistsDialog.cpp" line="144"/> + <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="232"/> + <location filename="../../FileExistsDialog.cpp" line="228"/> <source>Error</source> <translation type="unfinished">오류</translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="232"/> + <location filename="../../FileExistsDialog.cpp" line="228"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -297,21 +297,21 @@ <name>FileIsSameDialog</name> <message> <location filename="../../FileIsSameDialog.cpp" line="111"/> - <source>%1 - copy</source> + <source>%name% - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="121"/> - <source>%1 - copy (%2)</source> + <location filename="../../FileIsSameDialog.cpp" line="118"/> + <source>%name% - copy (%number%)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="188"/> + <location filename="../../FileIsSameDialog.cpp" line="184"/> <source>Error</source> <translation type="unfinished">오류</translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="188"/> + <location filename="../../FileIsSameDialog.cpp" line="184"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -464,21 +464,21 @@ </message> <message> <location filename="../../FolderExistsDialog.cpp" line="122"/> - <source>%1 - copy</source> + <source>%name% - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="132"/> - <source>%1 - copy (%2)</source> + <location filename="../../FolderExistsDialog.cpp" line="131"/> + <source>%name% - copy (%number%)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="193"/> + <location filename="../../FolderExistsDialog.cpp" line="190"/> <source>Error</source> <translation type="unfinished">오류</translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="193"/> + <location filename="../../FolderExistsDialog.cpp" line="190"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -486,49 +486,49 @@ <context> <name>ListThread</name> <message> - <location filename="../../ListThread.cpp" line="1482"/> - <location filename="../../ListThread.cpp" line="2414"/> + <location filename="../../ListThread.cpp" line="1487"/> + <location filename="../../ListThread.cpp" line="2419"/> <source>Unable do to move or copy item into wrong forced mode: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1489"/> - <location filename="../../ListThread.cpp" line="2421"/> + <location filename="../../ListThread.cpp" line="1494"/> + <location filename="../../ListThread.cpp" line="2426"/> <source>Unable to save the transfer list: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1505"/> + <location filename="../../ListThread.cpp" line="1510"/> <source>Problem reading file, or file-size is 0</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1512"/> + <location filename="../../ListThread.cpp" line="1517"/> <source>Wrong header: "%1"</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1521"/> + <location filename="../../ListThread.cpp" line="1526"/> <source>The transfer list is in mixed mode, but this instance is not in this mode</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1530"/> + <location filename="../../ListThread.cpp" line="1535"/> <source>The transfer list is in copy mode, but this instance is not in this mode</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1536"/> + <location filename="../../ListThread.cpp" line="1541"/> <source>The transfer list is in move mode, but this instance is not in this mode</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1599"/> + <location filename="../../ListThread.cpp" line="1604"/> <source>Some errors have been found during the line parsing</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1607"/> + <location filename="../../ListThread.cpp" line="1612"/> <source>Unable to open the transfer list: %1</source> <translation type="unfinished"></translation> </message> @@ -570,24 +570,24 @@ <context> <name>ReadThread</name> <message> - <location filename="../../ReadThread.cpp" line="55"/> + <location filename="../../ReadThread.cpp" line="59"/> <source>Internal error, please report it!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ReadThread.cpp" line="184"/> + <location filename="../../ReadThread.cpp" line="188"/> <source>Internal error reading the source file:block size out of range</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ReadThread.cpp" line="192"/> - <location filename="../../ReadThread.cpp" line="408"/> + <location filename="../../ReadThread.cpp" line="196"/> + <location filename="../../ReadThread.cpp" line="420"/> <source>Unable to read the source file: </source> <translation>원본 파일 읽기 불가:</translation> </message> <message> - <location filename="../../ReadThread.cpp" line="233"/> - <location filename="../../ReadThread.cpp" line="456"/> + <location filename="../../ReadThread.cpp" line="237"/> + <location filename="../../ReadThread.cpp" line="468"/> <source>File truncated during the read, possible data change</source> <translation type="unfinished"></translation> </message> @@ -600,37 +600,31 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../RenamingRules.ui" line="26"/> + <location filename="../../RenamingRules.ui" line="35"/> <source>First renaming</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../RenamingRules.ui" line="32"/> - <source>%name% - copy</source> + <location filename="../../RenamingRules.ui" line="41"/> + <source>%name% - copy%suffix%</source> <extracomment>%name% should not be translated</extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../../RenamingRules.ui" line="39"/> - <source><html><head/><body><p>Variables: <span style=" font-weight:600;">%name%</span> for the original file name</p></body></html></source> - <extracomment> should not be translated</extracomment> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../RenamingRules.ui" line="49"/> - <source>Second renaming</source> + <location filename="../../RenamingRules.ui" line="57"/> + <source>%name% - copy (%number%)%suffix%</source> + <extracomment>%name%, %number% should not be translated</extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../../RenamingRules.ui" line="55"/> - <source>%name% - copy (%number%)</source> + <location filename="../../RenamingRules.ui" line="67"/> + <source><html><head/><body><p>Variables: <span style=" font-weight:600;">%name%</span> for the original file name, <span style=" font-weight:600;">%number%</span> for the extra number, <span style=" font-weight:600;">%suffix%</span> file suffix</p></body></html></source> <extracomment>%name%, %number% should not be translated</extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../../RenamingRules.ui" line="62"/> - <source><html><head/><body><p>Variables: <span style=" font-weight:600;">%name%</span> for the original file name</p><p><span style=" font-weight:600;">%number%</span> for the extra number</p></body></html></source> - <extracomment>%name%, %number% should not be translated</extracomment> + <location filename="../../RenamingRules.ui" line="51"/> + <source>Second renaming</source> <translation type="unfinished"></translation> </message> <message> @@ -655,33 +649,41 @@ </message> <message> <location filename="../../ScanFileOrFolder.cpp" line="338"/> - <location filename="../../ScanFileOrFolder.cpp" line="404"/> <source>%1 - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="348"/> - <location filename="../../ScanFileOrFolder.cpp" line="414"/> + <location filename="../../ScanFileOrFolder.cpp" line="345"/> <source>%1 - copy (%2)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="452"/> + <location filename="../../ScanFileOrFolder.cpp" line="401"/> + <source>%name% - copy</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../ScanFileOrFolder.cpp" line="408"/> + <source>%name% - copy (%number%)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../ScanFileOrFolder.cpp" line="444"/> <source>This is not a folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="454"/> + <location filename="../../ScanFileOrFolder.cpp" line="446"/> <source>The folder does exists</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="456"/> + <location filename="../../ScanFileOrFolder.cpp" line="448"/> <source>The folder is not readable</source> <translation type="unfinished">폴더를 읽을 수 없습니다</translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="467"/> + <location filename="../../ScanFileOrFolder.cpp" line="459"/> <source>Problem with name encoding</source> <translation type="unfinished"></translation> </message> @@ -690,9 +692,9 @@ <name>TransferThread</name> <message> <location filename="../../TransferThread.cpp" line="244"/> - <location filename="../../TransferThread.cpp" line="677"/> - <location filename="../../TransferThread.cpp" line="749"/> - <location filename="../../TransferThread.cpp" line="1319"/> + <location filename="../../TransferThread.cpp" line="673"/> + <location filename="../../TransferThread.cpp" line="745"/> + <location filename="../../TransferThread.cpp" line="1315"/> <source>File not found</source> <translation type="unfinished"></translation> </message> @@ -725,60 +727,60 @@ </message> <message> <location filename="../../TransferThread.cpp" line="645"/> - <source>%1 - copy</source> + <source>%name% - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="655"/> - <source>%1 - copy (%2)</source> + <location filename="../../TransferThread.cpp" line="652"/> + <source>%name% - copy (%number%)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="715"/> - <location filename="../../TransferThread.cpp" line="830"/> + <location filename="../../TransferThread.cpp" line="711"/> + <location filename="../../TransferThread.cpp" line="826"/> <source>The source file doesn't exist</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="755"/> - <location filename="../../TransferThread.cpp" line="842"/> + <location filename="../../TransferThread.cpp" line="751"/> + <location filename="../../TransferThread.cpp" line="838"/> <source>Unable to do the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="791"/> + <location filename="../../TransferThread.cpp" line="787"/> <source>The source doesn't exist</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="836"/> + <location filename="../../TransferThread.cpp" line="832"/> <source>Another file exists at same place</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1138"/> + <location filename="../../TransferThread.cpp" line="1134"/> <source>The checksums do not match</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1228"/> + <location filename="../../TransferThread.cpp" line="1224"/> <source>Internal error: The destination is not closed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1243"/> + <location filename="../../TransferThread.cpp" line="1239"/> <source>Internal error: The size transfered doesn't match</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1254"/> + <location filename="../../TransferThread.cpp" line="1250"/> <source>Internal error: The buffer is not empty</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1319"/> - <location filename="../../TransferThread.cpp" line="1337"/> - <location filename="../../TransferThread.cpp" line="1352"/> + <location filename="../../TransferThread.cpp" line="1315"/> + <location filename="../../TransferThread.cpp" line="1333"/> + <location filename="../../TransferThread.cpp" line="1348"/> <source>Unable to change the date</source> <translation type="unfinished"></translation> </message> @@ -791,22 +793,22 @@ <context> <name>WriteThread</name> <message> - <location filename="../../WriteThread.cpp" line="80"/> + <location filename="../../WriteThread.cpp" line="83"/> <source>Path resolution error (Empty path)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../WriteThread.cpp" line="269"/> + <location filename="../../WriteThread.cpp" line="277"/> <source>Internal error, please report it!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../WriteThread.cpp" line="672"/> + <location filename="../../WriteThread.cpp" line="680"/> <source>Unable to read the source file: </source> <translation type="unfinished">원본 파일 읽기 불가:</translation> </message> <message> - <location filename="../../WriteThread.cpp" line="697"/> + <location filename="../../WriteThread.cpp" line="705"/> <source>File truncated during read, possible data change</source> <translation type="unfinished"></translation> </message> @@ -814,198 +816,198 @@ <context> <name>copyEngineOptions</name> <message> - <location filename="../../copyEngineOptions.ui" line="35"/> + <location filename="../../copyEngineOptions.ui" line="44"/> <source>Transfer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="44"/> + <location filename="../../copyEngineOptions.ui" line="53"/> <source>Move the whole folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="51"/> + <location filename="../../copyEngineOptions.ui" line="60"/> <source>Transfer the file rights</source> <translation type="unfinished">파일 권한 전송</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="61"/> + <location filename="../../copyEngineOptions.ui" line="70"/> <source>Keep the file date</source> <translation type="unfinished">파일 날짜 보존</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="74"/> + <location filename="../../copyEngineOptions.ui" line="83"/> <source>Autostart the transfer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="81"/> - <location filename="../../copyEngineOptions.ui" line="101"/> + <location filename="../../copyEngineOptions.ui" line="90"/> + <location filename="../../copyEngineOptions.ui" line="110"/> <source>Less performance if checked</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="104"/> + <location filename="../../copyEngineOptions.ui" line="113"/> <source>Follow the strict order</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="130"/> + <location filename="../../copyEngineOptions.ui" line="139"/> <source>Error and collision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="136"/> + <location filename="../../copyEngineOptions.ui" line="145"/> <source>When folder error</source> <translation type="unfinished">폴더 오류시</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="146"/> + <location filename="../../copyEngineOptions.ui" line="155"/> <source>When file error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="172"/> + <location filename="../../copyEngineOptions.ui" line="181"/> <source>When file collision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="232"/> + <location filename="../../copyEngineOptions.ui" line="241"/> <source>When folder collision</source> <translation type="unfinished">폴더 충돌시</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="263"/> + <location filename="../../copyEngineOptions.ui" line="272"/> <source>Check if destination folder exists</source> <translation type="unfinished">대상 폴드 존재시 확인</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="270"/> + <location filename="../../copyEngineOptions.ui" line="279"/> <source>Renaming rules</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="290"/> + <location filename="../../copyEngineOptions.ui" line="299"/> <source>Delete partially transferred files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="303"/> + <location filename="../../copyEngineOptions.ui" line="312"/> <source>Rename the original destination</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="334"/> + <location filename="../../copyEngineOptions.ui" line="343"/> <source>Control</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="340"/> + <location filename="../../copyEngineOptions.ui" line="349"/> <source>Checksum</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="349"/> + <location filename="../../copyEngineOptions.ui" line="358"/> <source>Only after error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="356"/> + <location filename="../../copyEngineOptions.ui" line="365"/> <source>Ignore if impossible</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="373"/> + <location filename="../../copyEngineOptions.ui" line="382"/> <source>Verify checksums</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="405"/> + <location filename="../../copyEngineOptions.ui" line="414"/> <source>Performance</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="411"/> + <location filename="../../copyEngineOptions.ui" line="420"/> <source>Parallel buffer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="418"/> - <location filename="../../copyEngineOptions.ui" line="431"/> - <location filename="../../copyEngineOptions.ui" line="444"/> - <location filename="../../copyEngineOptions.ui" line="481"/> - <location filename="../../copyEngineOptions.ui" line="550"/> + <location filename="../../copyEngineOptions.ui" line="427"/> + <location filename="../../copyEngineOptions.ui" line="440"/> + <location filename="../../copyEngineOptions.ui" line="453"/> + <location filename="../../copyEngineOptions.ui" line="490"/> + <location filename="../../copyEngineOptions.ui" line="559"/> <source>KB</source> <translation type="unfinished">KB</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="460"/> + <location filename="../../copyEngineOptions.ui" line="469"/> <source>Block size</source> <translation type="unfinished">블럭 크기</translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="467"/> + <location filename="../../copyEngineOptions.ui" line="476"/> <source>Sequential buffer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="474"/> + <location filename="../../copyEngineOptions.ui" line="483"/> <source>Enable OS buffer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="497"/> + <location filename="../../copyEngineOptions.ui" line="506"/> <source>OS buffer only if smaller than</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="504"/> + <location filename="../../copyEngineOptions.ui" line="513"/> <source>Transfer algorithm</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="543"/> + <location filename="../../copyEngineOptions.ui" line="552"/> <source>Parallelize if smaller than</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="573"/> - <source>Inode threads</source> + <location filename="../../copyEngineOptions.ui" line="582"/> + <source>Inode threads (unsafe > 1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="580"/> - <location filename="../../copyEngineOptions.ui" line="590"/> + <location filename="../../copyEngineOptions.ui" line="589"/> + <location filename="../../copyEngineOptions.ui" line="599"/> <source>More cpu, but better organisation on the disk</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="593"/> + <location filename="../../copyEngineOptions.ui" line="602"/> <source>Order the list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="609"/> + <location filename="../../copyEngineOptions.ui" line="618"/> <source>Misc</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="615"/> + <location filename="../../copyEngineOptions.ui" line="624"/> <source>Check the disk space</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="625"/> + <location filename="../../copyEngineOptions.ui" line="634"/> <source>Use this folder when destination is not set</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="637"/> + <location filename="../../copyEngineOptions.ui" line="646"/> <source>Browse</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="659"/> + <location filename="../../copyEngineOptions.ui" line="668"/> <source>Filters</source> <translation type="unfinished"></translation> </message> diff --git a/plugins/CopyEngine/Ultracopier/Languages/nl/translation.ts b/plugins/CopyEngine/Ultracopier/Languages/nl/translation.ts index 4d395a0..e17b3f2 100644 --- a/plugins/CopyEngine/Ultracopier/Languages/nl/translation.ts +++ b/plugins/CopyEngine/Ultracopier/Languages/nl/translation.ts @@ -146,85 +146,85 @@ <context> <name>CopyEngineFactory</name> <message> - <location filename="../../CopyEngineFactory.cpp" line="419"/> - <location filename="../../CopyEngineFactory.cpp" line="422"/> <location filename="../../CopyEngineFactory.cpp" line="427"/> - <location filename="../../CopyEngineFactory.cpp" line="431"/> + <location filename="../../CopyEngineFactory.cpp" line="430"/> + <location filename="../../CopyEngineFactory.cpp" line="435"/> + <location filename="../../CopyEngineFactory.cpp" line="439"/> <source>Ask</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="420"/> - <location filename="../../CopyEngineFactory.cpp" line="424"/> <location filename="../../CopyEngineFactory.cpp" line="428"/> <location filename="../../CopyEngineFactory.cpp" line="432"/> + <location filename="../../CopyEngineFactory.cpp" line="436"/> + <location filename="../../CopyEngineFactory.cpp" line="440"/> <source>Skip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="423"/> + <location filename="../../CopyEngineFactory.cpp" line="431"/> <source>Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="425"/> - <location filename="../../CopyEngineFactory.cpp" line="437"/> + <location filename="../../CopyEngineFactory.cpp" line="433"/> + <location filename="../../CopyEngineFactory.cpp" line="445"/> <source>Rename</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="429"/> + <location filename="../../CopyEngineFactory.cpp" line="437"/> <source>Put at the end</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="433"/> + <location filename="../../CopyEngineFactory.cpp" line="441"/> <source>Overwrite</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="434"/> + <location filename="../../CopyEngineFactory.cpp" line="442"/> <source>Overwrite if different</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="435"/> + <location filename="../../CopyEngineFactory.cpp" line="443"/> <source>Overwrite if newer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="436"/> + <location filename="../../CopyEngineFactory.cpp" line="444"/> <source>Overwrite if older</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="439"/> + <location filename="../../CopyEngineFactory.cpp" line="447"/> <source>Automatic</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="440"/> + <location filename="../../CopyEngineFactory.cpp" line="448"/> <source>Sequential</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="441"/> + <location filename="../../CopyEngineFactory.cpp" line="449"/> <source>Parallel</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="492"/> - <location filename="../../CopyEngineFactory.cpp" line="531"/> + <location filename="../../CopyEngineFactory.cpp" line="500"/> + <location filename="../../CopyEngineFactory.cpp" line="539"/> <source>Options error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="492"/> + <location filename="../../CopyEngineFactory.cpp" line="500"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="531"/> + <location filename="../../CopyEngineFactory.cpp" line="539"/> <source>Options engine is not loaded, can't access to the filters</source> <translation type="unfinished"></translation> </message> @@ -274,21 +274,21 @@ <name>FileExistsDialog</name> <message> <location filename="../../FileExistsDialog.cpp" line="137"/> - <source>%1 - copy</source> + <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="147"/> - <source>%1 - copy (%2)</source> + <location filename="../../FileExistsDialog.cpp" line="144"/> + <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="232"/> + <location filename="../../FileExistsDialog.cpp" line="228"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="232"/> + <location filename="../../FileExistsDialog.cpp" line="228"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -297,21 +297,21 @@ <name>FileIsSameDialog</name> <message> <location filename="../../FileIsSameDialog.cpp" line="111"/> - <source>%1 - copy</source> + <source>%name% - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="121"/> - <source>%1 - copy (%2)</source> + <location filename="../../FileIsSameDialog.cpp" line="118"/> + <source>%name% - copy (%number%)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="188"/> + <location filename="../../FileIsSameDialog.cpp" line="184"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="188"/> + <location filename="../../FileIsSameDialog.cpp" line="184"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -464,21 +464,21 @@ </message> <message> <location filename="../../FolderExistsDialog.cpp" line="122"/> - <source>%1 - copy</source> + <source>%name% - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="132"/> - <source>%1 - copy (%2)</source> + <location filename="../../FolderExistsDialog.cpp" line="131"/> + <source>%name% - copy (%number%)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="193"/> + <location filename="../../FolderExistsDialog.cpp" line="190"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="193"/> + <location filename="../../FolderExistsDialog.cpp" line="190"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -486,49 +486,49 @@ <context> <name>ListThread</name> <message> - <location filename="../../ListThread.cpp" line="1482"/> - <location filename="../../ListThread.cpp" line="2414"/> + <location filename="../../ListThread.cpp" line="1487"/> + <location filename="../../ListThread.cpp" line="2419"/> <source>Unable do to move or copy item into wrong forced mode: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1489"/> - <location filename="../../ListThread.cpp" line="2421"/> + <location filename="../../ListThread.cpp" line="1494"/> + <location filename="../../ListThread.cpp" line="2426"/> <source>Unable to save the transfer list: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1505"/> + <location filename="../../ListThread.cpp" line="1510"/> <source>Problem reading file, or file-size is 0</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1512"/> + <location filename="../../ListThread.cpp" line="1517"/> <source>Wrong header: "%1"</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1521"/> + <location filename="../../ListThread.cpp" line="1526"/> <source>The transfer list is in mixed mode, but this instance is not in this mode</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1530"/> + <location filename="../../ListThread.cpp" line="1535"/> <source>The transfer list is in copy mode, but this instance is not in this mode</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1536"/> + <location filename="../../ListThread.cpp" line="1541"/> <source>The transfer list is in move mode, but this instance is not in this mode</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1599"/> + <location filename="../../ListThread.cpp" line="1604"/> <source>Some errors have been found during the line parsing</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1607"/> + <location filename="../../ListThread.cpp" line="1612"/> <source>Unable to open the transfer list: %1</source> <translation type="unfinished"></translation> </message> @@ -570,24 +570,24 @@ <context> <name>ReadThread</name> <message> - <location filename="../../ReadThread.cpp" line="55"/> + <location filename="../../ReadThread.cpp" line="59"/> <source>Internal error, please report it!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ReadThread.cpp" line="184"/> + <location filename="../../ReadThread.cpp" line="188"/> <source>Internal error reading the source file:block size out of range</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ReadThread.cpp" line="192"/> - <location filename="../../ReadThread.cpp" line="408"/> + <location filename="../../ReadThread.cpp" line="196"/> + <location filename="../../ReadThread.cpp" line="420"/> <source>Unable to read the source file: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ReadThread.cpp" line="233"/> - <location filename="../../ReadThread.cpp" line="456"/> + <location filename="../../ReadThread.cpp" line="237"/> + <location filename="../../ReadThread.cpp" line="468"/> <source>File truncated during the read, possible data change</source> <translation type="unfinished"></translation> </message> @@ -595,37 +595,31 @@ <context> <name>RenamingRules</name> <message> - <location filename="../../RenamingRules.ui" line="26"/> + <location filename="../../RenamingRules.ui" line="35"/> <source>First renaming</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../RenamingRules.ui" line="32"/> - <source>%name% - copy</source> + <location filename="../../RenamingRules.ui" line="41"/> + <source>%name% - copy%suffix%</source> <extracomment>%name% should not be translated</extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../../RenamingRules.ui" line="39"/> - <source><html><head/><body><p>Variables: <span style=" font-weight:600;">%name%</span> for the original file name</p></body></html></source> - <extracomment> should not be translated</extracomment> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../RenamingRules.ui" line="49"/> - <source>Second renaming</source> + <location filename="../../RenamingRules.ui" line="57"/> + <source>%name% - copy (%number%)%suffix%</source> + <extracomment>%name%, %number% should not be translated</extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../../RenamingRules.ui" line="55"/> - <source>%name% - copy (%number%)</source> + <location filename="../../RenamingRules.ui" line="67"/> + <source><html><head/><body><p>Variables: <span style=" font-weight:600;">%name%</span> for the original file name, <span style=" font-weight:600;">%number%</span> for the extra number, <span style=" font-weight:600;">%suffix%</span> file suffix</p></body></html></source> <extracomment>%name%, %number% should not be translated</extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../../RenamingRules.ui" line="62"/> - <source><html><head/><body><p>Variables: <span style=" font-weight:600;">%name%</span> for the original file name</p><p><span style=" font-weight:600;">%number%</span> for the extra number</p></body></html></source> - <extracomment>%name%, %number% should not be translated</extracomment> + <location filename="../../RenamingRules.ui" line="51"/> + <source>Second renaming</source> <translation type="unfinished"></translation> </message> <message> @@ -655,33 +649,41 @@ </message> <message> <location filename="../../ScanFileOrFolder.cpp" line="338"/> - <location filename="../../ScanFileOrFolder.cpp" line="404"/> <source>%1 - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="348"/> - <location filename="../../ScanFileOrFolder.cpp" line="414"/> + <location filename="../../ScanFileOrFolder.cpp" line="345"/> <source>%1 - copy (%2)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="452"/> + <location filename="../../ScanFileOrFolder.cpp" line="401"/> + <source>%name% - copy</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../ScanFileOrFolder.cpp" line="408"/> + <source>%name% - copy (%number%)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../ScanFileOrFolder.cpp" line="444"/> <source>This is not a folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="454"/> + <location filename="../../ScanFileOrFolder.cpp" line="446"/> <source>The folder does exists</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="456"/> + <location filename="../../ScanFileOrFolder.cpp" line="448"/> <source>The folder is not readable</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="467"/> + <location filename="../../ScanFileOrFolder.cpp" line="459"/> <source>Problem with name encoding</source> <translation type="unfinished"></translation> </message> @@ -690,9 +692,9 @@ <name>TransferThread</name> <message> <location filename="../../TransferThread.cpp" line="244"/> - <location filename="../../TransferThread.cpp" line="677"/> - <location filename="../../TransferThread.cpp" line="749"/> - <location filename="../../TransferThread.cpp" line="1319"/> + <location filename="../../TransferThread.cpp" line="673"/> + <location filename="../../TransferThread.cpp" line="745"/> + <location filename="../../TransferThread.cpp" line="1315"/> <source>File not found</source> <translation type="unfinished"></translation> </message> @@ -725,60 +727,60 @@ </message> <message> <location filename="../../TransferThread.cpp" line="645"/> - <source>%1 - copy</source> + <source>%name% - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="655"/> - <source>%1 - copy (%2)</source> + <location filename="../../TransferThread.cpp" line="652"/> + <source>%name% - copy (%number%)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="715"/> - <location filename="../../TransferThread.cpp" line="830"/> + <location filename="../../TransferThread.cpp" line="711"/> + <location filename="../../TransferThread.cpp" line="826"/> <source>The source file doesn't exist</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="755"/> - <location filename="../../TransferThread.cpp" line="842"/> + <location filename="../../TransferThread.cpp" line="751"/> + <location filename="../../TransferThread.cpp" line="838"/> <source>Unable to do the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="791"/> + <location filename="../../TransferThread.cpp" line="787"/> <source>The source doesn't exist</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="836"/> + <location filename="../../TransferThread.cpp" line="832"/> <source>Another file exists at same place</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1138"/> + <location filename="../../TransferThread.cpp" line="1134"/> <source>The checksums do not match</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1228"/> + <location filename="../../TransferThread.cpp" line="1224"/> <source>Internal error: The destination is not closed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1243"/> + <location filename="../../TransferThread.cpp" line="1239"/> <source>Internal error: The size transfered doesn't match</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1254"/> + <location filename="../../TransferThread.cpp" line="1250"/> <source>Internal error: The buffer is not empty</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1319"/> - <location filename="../../TransferThread.cpp" line="1337"/> - <location filename="../../TransferThread.cpp" line="1352"/> + <location filename="../../TransferThread.cpp" line="1315"/> + <location filename="../../TransferThread.cpp" line="1333"/> + <location filename="../../TransferThread.cpp" line="1348"/> <source>Unable to change the date</source> <translation type="unfinished"></translation> </message> @@ -791,22 +793,22 @@ <context> <name>WriteThread</name> <message> - <location filename="../../WriteThread.cpp" line="80"/> + <location filename="../../WriteThread.cpp" line="83"/> <source>Path resolution error (Empty path)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../WriteThread.cpp" line="269"/> + <location filename="../../WriteThread.cpp" line="277"/> <source>Internal error, please report it!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../WriteThread.cpp" line="672"/> + <location filename="../../WriteThread.cpp" line="680"/> <source>Unable to read the source file: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../WriteThread.cpp" line="697"/> + <location filename="../../WriteThread.cpp" line="705"/> <source>File truncated during read, possible data change</source> <translation type="unfinished"></translation> </message> @@ -814,198 +816,198 @@ <context> <name>copyEngineOptions</name> <message> - <location filename="../../copyEngineOptions.ui" line="35"/> + <location filename="../../copyEngineOptions.ui" line="44"/> <source>Transfer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="44"/> + <location filename="../../copyEngineOptions.ui" line="53"/> <source>Move the whole folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="51"/> + <location filename="../../copyEngineOptions.ui" line="60"/> <source>Transfer the file rights</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="61"/> + <location filename="../../copyEngineOptions.ui" line="70"/> <source>Keep the file date</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="74"/> + <location filename="../../copyEngineOptions.ui" line="83"/> <source>Autostart the transfer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="81"/> - <location filename="../../copyEngineOptions.ui" line="101"/> + <location filename="../../copyEngineOptions.ui" line="90"/> + <location filename="../../copyEngineOptions.ui" line="110"/> <source>Less performance if checked</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="104"/> + <location filename="../../copyEngineOptions.ui" line="113"/> <source>Follow the strict order</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="130"/> + <location filename="../../copyEngineOptions.ui" line="139"/> <source>Error and collision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="136"/> + <location filename="../../copyEngineOptions.ui" line="145"/> <source>When folder error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="146"/> + <location filename="../../copyEngineOptions.ui" line="155"/> <source>When file error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="172"/> + <location filename="../../copyEngineOptions.ui" line="181"/> <source>When file collision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="232"/> + <location filename="../../copyEngineOptions.ui" line="241"/> <source>When folder collision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="263"/> + <location filename="../../copyEngineOptions.ui" line="272"/> <source>Check if destination folder exists</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="270"/> + <location filename="../../copyEngineOptions.ui" line="279"/> <source>Renaming rules</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="290"/> + <location filename="../../copyEngineOptions.ui" line="299"/> <source>Delete partially transferred files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="303"/> + <location filename="../../copyEngineOptions.ui" line="312"/> <source>Rename the original destination</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="334"/> + <location filename="../../copyEngineOptions.ui" line="343"/> <source>Control</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="340"/> + <location filename="../../copyEngineOptions.ui" line="349"/> <source>Checksum</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="349"/> + <location filename="../../copyEngineOptions.ui" line="358"/> <source>Only after error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="356"/> + <location filename="../../copyEngineOptions.ui" line="365"/> <source>Ignore if impossible</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="373"/> + <location filename="../../copyEngineOptions.ui" line="382"/> <source>Verify checksums</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="405"/> + <location filename="../../copyEngineOptions.ui" line="414"/> <source>Performance</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="411"/> + <location filename="../../copyEngineOptions.ui" line="420"/> <source>Parallel buffer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="418"/> - <location filename="../../copyEngineOptions.ui" line="431"/> - <location filename="../../copyEngineOptions.ui" line="444"/> - <location filename="../../copyEngineOptions.ui" line="481"/> - <location filename="../../copyEngineOptions.ui" line="550"/> + <location filename="../../copyEngineOptions.ui" line="427"/> + <location filename="../../copyEngineOptions.ui" line="440"/> + <location filename="../../copyEngineOptions.ui" line="453"/> + <location filename="../../copyEngineOptions.ui" line="490"/> + <location filename="../../copyEngineOptions.ui" line="559"/> <source>KB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="460"/> + <location filename="../../copyEngineOptions.ui" line="469"/> <source>Block size</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="467"/> + <location filename="../../copyEngineOptions.ui" line="476"/> <source>Sequential buffer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="474"/> + <location filename="../../copyEngineOptions.ui" line="483"/> <source>Enable OS buffer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="497"/> + <location filename="../../copyEngineOptions.ui" line="506"/> <source>OS buffer only if smaller than</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="504"/> + <location filename="../../copyEngineOptions.ui" line="513"/> <source>Transfer algorithm</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="543"/> + <location filename="../../copyEngineOptions.ui" line="552"/> <source>Parallelize if smaller than</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="573"/> - <source>Inode threads</source> + <location filename="../../copyEngineOptions.ui" line="582"/> + <source>Inode threads (unsafe > 1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="580"/> - <location filename="../../copyEngineOptions.ui" line="590"/> + <location filename="../../copyEngineOptions.ui" line="589"/> + <location filename="../../copyEngineOptions.ui" line="599"/> <source>More cpu, but better organisation on the disk</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="593"/> + <location filename="../../copyEngineOptions.ui" line="602"/> <source>Order the list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="609"/> + <location filename="../../copyEngineOptions.ui" line="618"/> <source>Misc</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="615"/> + <location filename="../../copyEngineOptions.ui" line="624"/> <source>Check the disk space</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="625"/> + <location filename="../../copyEngineOptions.ui" line="634"/> <source>Use this folder when destination is not set</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="637"/> + <location filename="../../copyEngineOptions.ui" line="646"/> <source>Browse</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="659"/> + <location filename="../../copyEngineOptions.ui" line="668"/> <source>Filters</source> <translation type="unfinished"></translation> </message> diff --git a/plugins/CopyEngine/Ultracopier/Languages/no/translation.ts b/plugins/CopyEngine/Ultracopier/Languages/no/translation.ts index 4d395a0..e17b3f2 100644 --- a/plugins/CopyEngine/Ultracopier/Languages/no/translation.ts +++ b/plugins/CopyEngine/Ultracopier/Languages/no/translation.ts @@ -146,85 +146,85 @@ <context> <name>CopyEngineFactory</name> <message> - <location filename="../../CopyEngineFactory.cpp" line="419"/> - <location filename="../../CopyEngineFactory.cpp" line="422"/> <location filename="../../CopyEngineFactory.cpp" line="427"/> - <location filename="../../CopyEngineFactory.cpp" line="431"/> + <location filename="../../CopyEngineFactory.cpp" line="430"/> + <location filename="../../CopyEngineFactory.cpp" line="435"/> + <location filename="../../CopyEngineFactory.cpp" line="439"/> <source>Ask</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="420"/> - <location filename="../../CopyEngineFactory.cpp" line="424"/> <location filename="../../CopyEngineFactory.cpp" line="428"/> <location filename="../../CopyEngineFactory.cpp" line="432"/> + <location filename="../../CopyEngineFactory.cpp" line="436"/> + <location filename="../../CopyEngineFactory.cpp" line="440"/> <source>Skip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="423"/> + <location filename="../../CopyEngineFactory.cpp" line="431"/> <source>Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="425"/> - <location filename="../../CopyEngineFactory.cpp" line="437"/> + <location filename="../../CopyEngineFactory.cpp" line="433"/> + <location filename="../../CopyEngineFactory.cpp" line="445"/> <source>Rename</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="429"/> + <location filename="../../CopyEngineFactory.cpp" line="437"/> <source>Put at the end</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="433"/> + <location filename="../../CopyEngineFactory.cpp" line="441"/> <source>Overwrite</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="434"/> + <location filename="../../CopyEngineFactory.cpp" line="442"/> <source>Overwrite if different</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="435"/> + <location filename="../../CopyEngineFactory.cpp" line="443"/> <source>Overwrite if newer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="436"/> + <location filename="../../CopyEngineFactory.cpp" line="444"/> <source>Overwrite if older</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="439"/> + <location filename="../../CopyEngineFactory.cpp" line="447"/> <source>Automatic</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="440"/> + <location filename="../../CopyEngineFactory.cpp" line="448"/> <source>Sequential</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="441"/> + <location filename="../../CopyEngineFactory.cpp" line="449"/> <source>Parallel</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="492"/> - <location filename="../../CopyEngineFactory.cpp" line="531"/> + <location filename="../../CopyEngineFactory.cpp" line="500"/> + <location filename="../../CopyEngineFactory.cpp" line="539"/> <source>Options error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="492"/> + <location filename="../../CopyEngineFactory.cpp" line="500"/> <source>Options engine is not loaded. Unable to access the filters</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="531"/> + <location filename="../../CopyEngineFactory.cpp" line="539"/> <source>Options engine is not loaded, can't access to the filters</source> <translation type="unfinished"></translation> </message> @@ -274,21 +274,21 @@ <name>FileExistsDialog</name> <message> <location filename="../../FileExistsDialog.cpp" line="137"/> - <source>%1 - copy</source> + <source>%name% - copy%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="147"/> - <source>%1 - copy (%2)</source> + <location filename="../../FileExistsDialog.cpp" line="144"/> + <source>%name% - copy (%number%)%suffix%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="232"/> + <location filename="../../FileExistsDialog.cpp" line="228"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileExistsDialog.cpp" line="232"/> + <location filename="../../FileExistsDialog.cpp" line="228"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -297,21 +297,21 @@ <name>FileIsSameDialog</name> <message> <location filename="../../FileIsSameDialog.cpp" line="111"/> - <source>%1 - copy</source> + <source>%name% - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="121"/> - <source>%1 - copy (%2)</source> + <location filename="../../FileIsSameDialog.cpp" line="118"/> + <source>%name% - copy (%number%)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="188"/> + <location filename="../../FileIsSameDialog.cpp" line="184"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FileIsSameDialog.cpp" line="188"/> + <location filename="../../FileIsSameDialog.cpp" line="184"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -464,21 +464,21 @@ </message> <message> <location filename="../../FolderExistsDialog.cpp" line="122"/> - <source>%1 - copy</source> + <source>%name% - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="132"/> - <source>%1 - copy (%2)</source> + <location filename="../../FolderExistsDialog.cpp" line="131"/> + <source>%name% - copy (%number%)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="193"/> + <location filename="../../FolderExistsDialog.cpp" line="190"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../FolderExistsDialog.cpp" line="193"/> + <location filename="../../FolderExistsDialog.cpp" line="190"/> <source>Try rename with using special characters</source> <translation type="unfinished"></translation> </message> @@ -486,49 +486,49 @@ <context> <name>ListThread</name> <message> - <location filename="../../ListThread.cpp" line="1482"/> - <location filename="../../ListThread.cpp" line="2414"/> + <location filename="../../ListThread.cpp" line="1487"/> + <location filename="../../ListThread.cpp" line="2419"/> <source>Unable do to move or copy item into wrong forced mode: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1489"/> - <location filename="../../ListThread.cpp" line="2421"/> + <location filename="../../ListThread.cpp" line="1494"/> + <location filename="../../ListThread.cpp" line="2426"/> <source>Unable to save the transfer list: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1505"/> + <location filename="../../ListThread.cpp" line="1510"/> <source>Problem reading file, or file-size is 0</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1512"/> + <location filename="../../ListThread.cpp" line="1517"/> <source>Wrong header: "%1"</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1521"/> + <location filename="../../ListThread.cpp" line="1526"/> <source>The transfer list is in mixed mode, but this instance is not in this mode</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1530"/> + <location filename="../../ListThread.cpp" line="1535"/> <source>The transfer list is in copy mode, but this instance is not in this mode</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1536"/> + <location filename="../../ListThread.cpp" line="1541"/> <source>The transfer list is in move mode, but this instance is not in this mode</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1599"/> + <location filename="../../ListThread.cpp" line="1604"/> <source>Some errors have been found during the line parsing</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ListThread.cpp" line="1607"/> + <location filename="../../ListThread.cpp" line="1612"/> <source>Unable to open the transfer list: %1</source> <translation type="unfinished"></translation> </message> @@ -570,24 +570,24 @@ <context> <name>ReadThread</name> <message> - <location filename="../../ReadThread.cpp" line="55"/> + <location filename="../../ReadThread.cpp" line="59"/> <source>Internal error, please report it!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ReadThread.cpp" line="184"/> + <location filename="../../ReadThread.cpp" line="188"/> <source>Internal error reading the source file:block size out of range</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ReadThread.cpp" line="192"/> - <location filename="../../ReadThread.cpp" line="408"/> + <location filename="../../ReadThread.cpp" line="196"/> + <location filename="../../ReadThread.cpp" line="420"/> <source>Unable to read the source file: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ReadThread.cpp" line="233"/> - <location filename="../../ReadThread.cpp" line="456"/> + <location filename="../../ReadThread.cpp" line="237"/> + <location filename="../../ReadThread.cpp" line="468"/> <source>File truncated during the read, possible data change</source> <translation type="unfinished"></translation> </message> @@ -595,37 +595,31 @@ <context> <name>RenamingRules</name> <message> - <location filename="../../RenamingRules.ui" line="26"/> + <location filename="../../RenamingRules.ui" line="35"/> <source>First renaming</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../RenamingRules.ui" line="32"/> - <source>%name% - copy</source> + <location filename="../../RenamingRules.ui" line="41"/> + <source>%name% - copy%suffix%</source> <extracomment>%name% should not be translated</extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../../RenamingRules.ui" line="39"/> - <source><html><head/><body><p>Variables: <span style=" font-weight:600;">%name%</span> for the original file name</p></body></html></source> - <extracomment> should not be translated</extracomment> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../RenamingRules.ui" line="49"/> - <source>Second renaming</source> + <location filename="../../RenamingRules.ui" line="57"/> + <source>%name% - copy (%number%)%suffix%</source> + <extracomment>%name%, %number% should not be translated</extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../../RenamingRules.ui" line="55"/> - <source>%name% - copy (%number%)</source> + <location filename="../../RenamingRules.ui" line="67"/> + <source><html><head/><body><p>Variables: <span style=" font-weight:600;">%name%</span> for the original file name, <span style=" font-weight:600;">%number%</span> for the extra number, <span style=" font-weight:600;">%suffix%</span> file suffix</p></body></html></source> <extracomment>%name%, %number% should not be translated</extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../../RenamingRules.ui" line="62"/> - <source><html><head/><body><p>Variables: <span style=" font-weight:600;">%name%</span> for the original file name</p><p><span style=" font-weight:600;">%number%</span> for the extra number</p></body></html></source> - <extracomment>%name%, %number% should not be translated</extracomment> + <location filename="../../RenamingRules.ui" line="51"/> + <source>Second renaming</source> <translation type="unfinished"></translation> </message> <message> @@ -655,33 +649,41 @@ </message> <message> <location filename="../../ScanFileOrFolder.cpp" line="338"/> - <location filename="../../ScanFileOrFolder.cpp" line="404"/> <source>%1 - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="348"/> - <location filename="../../ScanFileOrFolder.cpp" line="414"/> + <location filename="../../ScanFileOrFolder.cpp" line="345"/> <source>%1 - copy (%2)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="452"/> + <location filename="../../ScanFileOrFolder.cpp" line="401"/> + <source>%name% - copy</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../ScanFileOrFolder.cpp" line="408"/> + <source>%name% - copy (%number%)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../ScanFileOrFolder.cpp" line="444"/> <source>This is not a folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="454"/> + <location filename="../../ScanFileOrFolder.cpp" line="446"/> <source>The folder does exists</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="456"/> + <location filename="../../ScanFileOrFolder.cpp" line="448"/> <source>The folder is not readable</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ScanFileOrFolder.cpp" line="467"/> + <location filename="../../ScanFileOrFolder.cpp" line="459"/> <source>Problem with name encoding</source> <translation type="unfinished"></translation> </message> @@ -690,9 +692,9 @@ <name>TransferThread</name> <message> <location filename="../../TransferThread.cpp" line="244"/> - <location filename="../../TransferThread.cpp" line="677"/> - <location filename="../../TransferThread.cpp" line="749"/> - <location filename="../../TransferThread.cpp" line="1319"/> + <location filename="../../TransferThread.cpp" line="673"/> + <location filename="../../TransferThread.cpp" line="745"/> + <location filename="../../TransferThread.cpp" line="1315"/> <source>File not found</source> <translation type="unfinished"></translation> </message> @@ -725,60 +727,60 @@ </message> <message> <location filename="../../TransferThread.cpp" line="645"/> - <source>%1 - copy</source> + <source>%name% - copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="655"/> - <source>%1 - copy (%2)</source> + <location filename="../../TransferThread.cpp" line="652"/> + <source>%name% - copy (%number%)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="715"/> - <location filename="../../TransferThread.cpp" line="830"/> + <location filename="../../TransferThread.cpp" line="711"/> + <location filename="../../TransferThread.cpp" line="826"/> <source>The source file doesn't exist</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="755"/> - <location filename="../../TransferThread.cpp" line="842"/> + <location filename="../../TransferThread.cpp" line="751"/> + <location filename="../../TransferThread.cpp" line="838"/> <source>Unable to do the folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="791"/> + <location filename="../../TransferThread.cpp" line="787"/> <source>The source doesn't exist</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="836"/> + <location filename="../../TransferThread.cpp" line="832"/> <source>Another file exists at same place</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1138"/> + <location filename="../../TransferThread.cpp" line="1134"/> <source>The checksums do not match</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1228"/> + <location filename="../../TransferThread.cpp" line="1224"/> <source>Internal error: The destination is not closed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1243"/> + <location filename="../../TransferThread.cpp" line="1239"/> <source>Internal error: The size transfered doesn't match</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1254"/> + <location filename="../../TransferThread.cpp" line="1250"/> <source>Internal error: The buffer is not empty</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../TransferThread.cpp" line="1319"/> - <location filename="../../TransferThread.cpp" line="1337"/> - <location filename="../../TransferThread.cpp" line="1352"/> + <location filename="../../TransferThread.cpp" line="1315"/> + <location filename="../../TransferThread.cpp" line="1333"/> + <location filename="../../TransferThread.cpp" line="1348"/> <source>Unable to change the date</source> <translation type="unfinished"></translation> </message> @@ -791,22 +793,22 @@ <context> <name>WriteThread</name> <message> - <location filename="../../WriteThread.cpp" line="80"/> + <location filename="../../WriteThread.cpp" line="83"/> <source>Path resolution error (Empty path)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../WriteThread.cpp" line="269"/> + <location filename="../../WriteThread.cpp" line="277"/> <source>Internal error, please report it!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../WriteThread.cpp" line="672"/> + <location filename="../../WriteThread.cpp" line="680"/> <source>Unable to read the source file: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../WriteThread.cpp" line="697"/> + <location filename="../../WriteThread.cpp" line="705"/> <source>File truncated during read, possible data change</source> <translation type="unfinished"></translation> </message> @@ -814,198 +816,198 @@ <context> <name>copyEngineOptions</name> <message> - <location filename="../../copyEngineOptions.ui" line="35"/> + <location filename="../../copyEngineOptions.ui" line="44"/> <source>Transfer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="44"/> + <location filename="../../copyEngineOptions.ui" line="53"/> <source>Move the whole folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="51"/> + <location filename="../../copyEngineOptions.ui" line="60"/> <source>Transfer the file rights</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="61"/> + <location filename="../../copyEngineOptions.ui" line="70"/> <source>Keep the file date</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="74"/> + <location filename="../../copyEngineOptions.ui" line="83"/> <source>Autostart the transfer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="81"/> - <location filename="../../copyEngineOptions.ui" line="101"/> + <location filename="../../copyEngineOptions.ui" line="90"/> + <location filename="../../copyEngineOptions.ui" line="110"/> <source>Less performance if checked</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="104"/> + <location filename="../../copyEngineOptions.ui" line="113"/> <source>Follow the strict order</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="130"/> + <location filename="../../copyEngineOptions.ui" line="139"/> <source>Error and collision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="136"/> + <location filename="../../copyEngineOptions.ui" line="145"/> <source>When folder error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="146"/> + <location filename="../../copyEngineOptions.ui" line="155"/> <source>When file error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="172"/> + <location filename="../../copyEngineOptions.ui" line="181"/> <source>When file collision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="232"/> + <location filename="../../copyEngineOptions.ui" line="241"/> <source>When folder collision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="263"/> + <location filename="../../copyEngineOptions.ui" line="272"/> <source>Check if destination folder exists</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="270"/> + <location filename="../../copyEngineOptions.ui" line="279"/> <source>Renaming rules</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="290"/> + <location filename="../../copyEngineOptions.ui" line="299"/> <source>Delete partially transferred files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="303"/> + <location filename="../../copyEngineOptions.ui" line="312"/> <source>Rename the original destination</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="334"/> + <location filename="../../copyEngineOptions.ui" line="343"/> <source>Control</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="340"/> + <location filename="../../copyEngineOptions.ui" line="349"/> <source>Checksum</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="349"/> + <location filename="../../copyEngineOptions.ui" line="358"/> <source>Only after error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="356"/> + <location filename="../../copyEngineOptions.ui" line="365"/> <source>Ignore if impossible</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="373"/> + <location filename="../../copyEngineOptions.ui" line="382"/> <source>Verify checksums</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="405"/> + <location filename="../../copyEngineOptions.ui" line="414"/> <source>Performance</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="411"/> + <location filename="../../copyEngineOptions.ui" line="420"/> <source>Parallel buffer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="418"/> - <location filename="../../copyEngineOptions.ui" line="431"/> - <location filename="../../copyEngineOptions.ui" line="444"/> - <location filename="../../copyEngineOptions.ui" line="481"/> - <location filename="../../copyEngineOptions.ui" line="550"/> + <location filename="../../copyEngineOptions.ui" line="427"/> + <location filename="../../copyEngineOptions.ui" line="440"/> + <location filename="../../copyEngineOptions.ui" line="453"/> + <location filename="../../copyEngineOptions.ui" line="490"/> + <location filename="../../copyEngineOptions.ui" line="559"/> <source>KB</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="460"/> + <location filename="../../copyEngineOptions.ui" line="469"/> <source>Block size</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="467"/> + <location filename="../../copyEngineOptions.ui" line="476"/> <source>Sequential buffer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="474"/> + <location filename="../../copyEngineOptions.ui" line="483"/> <source>Enable OS buffer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="497"/> + <location filename="../../copyEngineOptions.ui" line="506"/> <source>OS buffer only if smaller than</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="504"/> + <location filename="../../copyEngineOptions.ui" line="513"/> <source>Transfer algorithm</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="543"/> + <location filename="../../copyEngineOptions.ui" line="552"/> <source>Parallelize if smaller than</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="573"/> - <source>Inode threads</source> + <location filename="../../copyEngineOptions.ui" line="582"/> + <source>Inode threads (unsafe > 1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="580"/> - <location filename="../../copyEngineOptions.ui" line="590"/> + <location filename="../../copyEngineOptions.ui" line="589"/> + <location filename="../../copyEngineOptions.ui" line="599"/> <source>More cpu, but better organisation on the disk</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="593"/> + <location filename="../../copyEngineOptions.ui" line="602"/> <source>Order the list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="609"/> + <location filename="../../copyEngineOptions.ui" line="618"/> <source>Misc</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="615"/> + <location filename="../../copyEngineOptions.ui" line="624"/> <source>Check the disk space</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="625"/> + <location filename="../../copyEngineOptions.ui" line="634"/> <source>Use this folder when destination is not set</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="637"/> + <location filename="../../copyEngineOptions.ui" line="646"/> <source>Browse</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../copyEngineOptions.ui" line="659"/> + <location filename="../../copyEngineOptions.ui" line="668"/> <source>Filters</source> <translation type="unfinished"></translation> </message> diff --git a/plugins/CopyEngine/Ultracopier/Languages/pl/translation.ts b/plugins/CopyEngine/Ultracopier/Languages/pl/translation.ts index 4d395a0..e17b3f2 100644 --- a/plugins/CopyEngine/Ultracopier/Languages/pl/translation.ts +++ b/plugins/CopyEngine/Ultracopier/Languages/pl/translation.ts @@ -146,85 +146,85 @@ <context> <name>CopyEngineFactory</name> <message> - <location filename="../../CopyEngineFactory.cpp" line="419"/> - <location filename="../../CopyEngineFactory.cpp" line="422"/> <location filename="../../CopyEngineFactory.cpp" line="427"/> - <location filename="../../CopyEngineFactory.cpp" line="431"/> + <location filename="../../CopyEngineFactory.cpp" line="430"/> + <location filename="../../CopyEngineFactory.cpp" line="435"/> + <location filename="../../CopyEngineFactory.cpp" line="439"/> <source>Ask</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="420"/> - <location filename="../../CopyEngineFactory.cpp" line="424"/> <location filename="../../CopyEngineFactory.cpp" line="428"/> <location filename="../../CopyEngineFactory.cpp" line="432"/> + <location filename="../../CopyEngineFactory.cpp" line="436"/> + <location filename="../../CopyEngineFactory.cpp" line="440"/> <source>Skip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="423"/> + <location filename="../../CopyEngineFactory.cpp" line="431"/> <source>Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="425"/> - <location filename="../../CopyEngineFactory.cpp" line="437"/> + <location filename="../../CopyEngineFactory.cpp" line="433"/> + <location filename="../../CopyEngineFactory.cpp" line="445"/> <source>Rename</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="429"/> + <location filename="../../CopyEngineFactory.cpp" line="437"/> <source>Put at the end</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="433"/> + <location filename="../../CopyEngineFactory.cpp" line="441"/> <source>Overwrite</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="434"/> + <location filename="../../CopyEngineFactory.cpp" line="442"/> <source>Overwrite if different</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="435"/> + <location filename="../../CopyEngineFactory.cpp" line="443"/> <source>Overwrite if newer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="436"/> + <location filename="../../CopyEngineFactory.cpp" line="444"/> <source>Overwrite if older</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="439"/> + <location filename="../../CopyEngineFactory.cpp" line="447"/> <source>Automatic</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../CopyEngineFactory.cpp" line="440"/> + <location filename="../../CopyEngineFactory.cpp" line="448"/> <source>Sequential</source> |