From 5b240dd94561bef6a030b25cfa70838053ad53b2 Mon Sep 17 00:00:00 2001 From: Thomas Preud'homme Date: Thu, 1 Mar 2018 22:39:56 +0000 Subject: New upstream version 1.4.0.4 --- OptionDialog.cpp | 7 ---- OptionDialog.h | 1 - OptionDialog.ui | 33 ++++++++------- PluginsManager.cpp | 2 +- README | 2 +- Variable.h | 4 +- main.cpp | 1 - plugins-alternative/Listener/dbus/informations.xml | 2 +- .../PluginLoader/keybinding/informations.xml | 2 +- .../SessionLoader/KDE4/informations.xml | 2 +- plugins-alternative/Themes/Clean/informations.xml | 2 +- .../Themes/Teracopy/informations.xml | 2 +- .../Themes/Windows/informations.xml | 2 +- plugins/CopyEngine/Rsync/informations.xml | 2 +- plugins/CopyEngine/Ultracopier/DriveManagement.cpp | 1 + plugins/CopyEngine/Ultracopier/ListThread.cpp | 25 ++++++----- plugins/CopyEngine/Ultracopier/informations.xml | 2 +- plugins/Languages/ar/informations.xml | 2 +- plugins/Languages/de/informations.xml | 2 +- plugins/Languages/el/informations.xml | 2 +- plugins/Languages/es/informations.xml | 2 +- plugins/Languages/fr/informations.xml | 2 +- plugins/Languages/hi/informations.xml | 2 +- plugins/Languages/hu/informations.xml | 2 +- plugins/Languages/id/informations.xml | 2 +- plugins/Languages/it/informations.xml | 2 +- plugins/Languages/ja/informations.xml | 2 +- plugins/Languages/ko/informations.xml | 2 +- plugins/Languages/nl/informations.xml | 2 +- plugins/Languages/no/informations.xml | 2 +- plugins/Languages/pl/informations.xml | 2 +- plugins/Languages/pt/informations.xml | 2 +- plugins/Languages/ru/informations.xml | 2 +- plugins/Languages/th/informations.xml | 2 +- plugins/Languages/tr/informations.xml | 2 +- plugins/Languages/zh/informations.xml | 2 +- plugins/Languages/zh_TW/informations.xml | 2 +- plugins/Listener/catchcopy-v0002/informations.xml | 2 +- .../PluginLoader/catchcopy-v0002/informations.xml | 2 +- plugins/SessionLoader/Windows/informations.xml | 2 +- plugins/Themes/Oxygen/Languages/ar/translation.ts | 48 ++++++++++++---------- plugins/Themes/Oxygen/Languages/de/translation.ts | 48 ++++++++++++---------- plugins/Themes/Oxygen/Languages/el/translation.ts | 48 ++++++++++++---------- plugins/Themes/Oxygen/Languages/en/translation.ts | 48 ++++++++++++---------- plugins/Themes/Oxygen/Languages/es/translation.ts | 48 ++++++++++++---------- plugins/Themes/Oxygen/Languages/fr/translation.ts | 10 ++++- plugins/Themes/Oxygen/Languages/hi/translation.ts | 48 ++++++++++++---------- plugins/Themes/Oxygen/Languages/hu/translation.ts | 48 ++++++++++++---------- plugins/Themes/Oxygen/Languages/id/translation.ts | 48 ++++++++++++---------- plugins/Themes/Oxygen/Languages/it/translation.ts | 48 ++++++++++++---------- plugins/Themes/Oxygen/Languages/ja/translation.ts | 48 ++++++++++++---------- plugins/Themes/Oxygen/Languages/ko/translation.ts | 10 ++++- plugins/Themes/Oxygen/Languages/nl/translation.ts | 48 ++++++++++++---------- plugins/Themes/Oxygen/Languages/no/translation.ts | 48 ++++++++++++---------- plugins/Themes/Oxygen/Languages/pl/translation.ts | 48 ++++++++++++---------- plugins/Themes/Oxygen/Languages/pt/translation.ts | 48 ++++++++++++---------- plugins/Themes/Oxygen/Languages/ru/translation.ts | 48 ++++++++++++---------- plugins/Themes/Oxygen/Languages/th/translation.ts | 48 ++++++++++++---------- plugins/Themes/Oxygen/Languages/tr/translation.ts | 48 ++++++++++++---------- plugins/Themes/Oxygen/Languages/zh/translation.ts | 48 ++++++++++++---------- plugins/Themes/Oxygen/informations.xml | 2 +- plugins/Themes/Supercopier/informations.xml | 2 +- resources/Languages/en/informations.xml | 2 +- 63 files changed, 569 insertions(+), 459 deletions(-) diff --git a/OptionDialog.cpp b/OptionDialog.cpp index 32b9fd7..4c64875 100644 --- a/OptionDialog.cpp +++ b/OptionDialog.cpp @@ -404,7 +404,6 @@ void OptionDialog::loadOption() newOptionValue("Ultracopier", "confirmToGroupWindows", OptionEngine::optionEngine->getOptionValue("Ultracopier","confirmToGroupWindows")); newOptionValue("Ultracopier", "displayOSSpecific", OptionEngine::optionEngine->getOptionValue("Ultracopier","displayOSSpecific")); newOptionValue("Ultracopier", "checkTheUpdate", OptionEngine::optionEngine->getOptionValue("Ultracopier","checkTheUpdate")); - newOptionValue("Ultracopier", "giveGPUTime", OptionEngine::optionEngine->getOptionValue("Ultracopier","giveGPUTime")); newOptionValue("Ultracopier", "remainingTimeAlgorithm", OptionEngine::optionEngine->getOptionValue("Ultracopier","remainingTimeAlgorithm")); newOptionValue("Language", "Language", OptionEngine::optionEngine->getOptionValue("Language","Language")); newOptionValue("Language", "Language_force", OptionEngine::optionEngine->getOptionValue("Language","Language_force")); @@ -1006,12 +1005,6 @@ void OptionDialog::on_confirmToGroupWindows_clicked() OptionEngine::optionEngine->setOptionValue("Ultracopier","confirmToGroupWindows",booltostring(ui->confirmToGroupWindows->isChecked())); } -void OptionDialog::on_giveGPUTime_clicked() -{ - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"start"); - OptionEngine::optionEngine->setOptionValue("Ultracopier","giveGPUTime",booltostring(ui->giveGPUTime->isChecked())); -} - void OptionDialog::on_remainingTimeAlgorithm_currentIndexChanged(int index) { if(allPluginsIsLoaded) diff --git a/OptionDialog.h b/OptionDialog.h index 8223494..c8e9db3 100644 --- a/OptionDialog.h +++ b/OptionDialog.h @@ -79,7 +79,6 @@ private slots: void on_DisplayOSWarning_clicked(); void on_checkTheUpdate_clicked(); void on_confirmToGroupWindows_clicked(); - void on_giveGPUTime_clicked(); void oSSpecificClosed(); void on_remainingTimeAlgorithm_currentIndexChanged(int index); diff --git a/OptionDialog.ui b/OptionDialog.ui index 5ed7b52..54d9591 100644 --- a/OptionDialog.ui +++ b/OptionDialog.ui @@ -21,7 +21,16 @@ 1 - + + 1 + + + 1 + + + 1 + + 1 @@ -223,6 +232,9 @@ + + + @@ -233,12 +245,6 @@ - - - - - - @@ -246,24 +252,17 @@ - - + + - - - Give GPU time to fund the development - - - - Remaining time algorithm - + diff --git a/PluginsManager.cpp b/PluginsManager.cpp index 95c158d..269e837 100644 --- a/PluginsManager.cpp +++ b/PluginsManager.cpp @@ -907,7 +907,7 @@ void PluginsManager::newAuthPath(const std::string &path) /// \brief transfor short plugin name into file name std::string PluginsManager::getResolvedPluginName(const std::string &name) { - #if defined(Q_OS_LINUX) + #if defined(Q_OS_LINUX) || defined(Q_OS_HURD) return "lib"+name+".so"; #elif defined(Q_OS_MAC) #if defined(QT_DEBUG) diff --git a/README b/README index 8f15a2e..5b617ab 100644 --- a/README +++ b/README @@ -38,7 +38,7 @@ 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-all-in-one-direct.pro to have easy and NO modular software. This is more oriented to GNU/Linux and macOS. +Prefer ultracopier.pro to have easy and NO modular software. This is more oriented to GNU/Linux and macOS. ====================================================== Warranty ============================================= diff --git a/Variable.h b/Variable.h index b3d2649..c3d01a3 100644 --- a/Variable.h +++ b/Variable.h @@ -12,9 +12,9 @@ #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.3" +#define ULTRACOPIER_VERSION "1.4.0.4" /// \brief the windows version -#define ULTRACOPIER_WINDOWS_VERSION 1,4,0,3 +#define ULTRACOPIER_WINDOWS_VERSION 1,4,0,4 // define if the version is portable or not ////#define ULTRACOPIER_VERSION_PORTABLE ////#define ULTRACOPIER_VERSION_PORTABLEAPPS diff --git a/main.cpp b/main.cpp index 4c45d04..0a702b6 100644 --- a/main.cpp +++ b/main.cpp @@ -56,7 +56,6 @@ void registerTheOptions() KeysList.push_back(std::pair("GroupWindowWhen","0")); KeysList.push_back(std::pair("displayOSSpecific","true")); KeysList.push_back(std::pair("confirmToGroupWindows","true")); - KeysList.push_back(std::pair("giveGPUTime","true")); KeysList.push_back(std::pair("remainingTimeAlgorithm","0")); #ifdef ULTRACOPIER_INTERNET_SUPPORT #if defined(Q_OS_WIN32) || defined(Q_OS_MAC) diff --git a/plugins-alternative/Listener/dbus/informations.xml b/plugins-alternative/Listener/dbus/informations.xml index 77cba57..6ecae52 100644 --- a/plugins-alternative/Listener/dbus/informations.xml +++ b/plugins-alternative/Listener/dbus/informations.xml @@ -17,7 +17,7 @@ - 1.4.0.3 + 1.4.0.4 dbus diff --git a/plugins-alternative/PluginLoader/keybinding/informations.xml b/plugins-alternative/PluginLoader/keybinding/informations.xml index 2caf359..213c7bd 100644 --- a/plugins-alternative/PluginLoader/keybinding/informations.xml +++ b/plugins-alternative/PluginLoader/keybinding/informations.xml @@ -17,7 +17,7 @@ - 1.4.0.3 + 1.4.0.4 keybinding diff --git a/plugins-alternative/SessionLoader/KDE4/informations.xml b/plugins-alternative/SessionLoader/KDE4/informations.xml index 33d260f..14f8bea 100644 --- a/plugins-alternative/SessionLoader/KDE4/informations.xml +++ b/plugins-alternative/SessionLoader/KDE4/informations.xml @@ -17,7 +17,7 @@ - 1.4.0.3 + 1.4.0.4 KDE4 diff --git a/plugins-alternative/Themes/Clean/informations.xml b/plugins-alternative/Themes/Clean/informations.xml index 6e5a8fb..4a2f826 100644 --- a/plugins-alternative/Themes/Clean/informations.xml +++ b/plugins-alternative/Themes/Clean/informations.xml @@ -17,7 +17,7 @@ - 1.4.0.3 + 1.4.0.4 Clean diff --git a/plugins-alternative/Themes/Teracopy/informations.xml b/plugins-alternative/Themes/Teracopy/informations.xml index 0b3393e..a28e08d 100644 --- a/plugins-alternative/Themes/Teracopy/informations.xml +++ b/plugins-alternative/Themes/Teracopy/informations.xml @@ -17,7 +17,7 @@ - 1.4.0.3 + 1.4.0.4 Teracopy diff --git a/plugins-alternative/Themes/Windows/informations.xml b/plugins-alternative/Themes/Windows/informations.xml index f97dce3..1871990 100644 --- a/plugins-alternative/Themes/Windows/informations.xml +++ b/plugins-alternative/Themes/Windows/informations.xml @@ -17,7 +17,7 @@ - 1.4.0.3 + 1.4.0.4 Windows diff --git a/plugins/CopyEngine/Rsync/informations.xml b/plugins/CopyEngine/Rsync/informations.xml index 46cbf7e..17c9f26 100644 --- a/plugins/CopyEngine/Rsync/informations.xml +++ b/plugins/CopyEngine/Rsync/informations.xml @@ -14,7 +14,7 @@ - 1.4.0.3 + 1.4.0.4 Rsync diff --git a/plugins/CopyEngine/Ultracopier/DriveManagement.cpp b/plugins/CopyEngine/Ultracopier/DriveManagement.cpp index 8deaf3c..f25836f 100644 --- a/plugins/CopyEngine/Ultracopier/DriveManagement.cpp +++ b/plugins/CopyEngine/Ultracopier/DriveManagement.cpp @@ -19,6 +19,7 @@ DriveManagement::DriveManagement() } //get drive of an file or folder +/// \todo do network drive support for windows std::string DriveManagement::getDrive(const std::string &fileOrFolder) const { const std::string &inode=QDir::toNativeSeparators(QString::fromStdString(fileOrFolder)).toStdString(); diff --git a/plugins/CopyEngine/Ultracopier/ListThread.cpp b/plugins/CopyEngine/Ultracopier/ListThread.cpp index 4b9cde5..8d47326 100644 --- a/plugins/CopyEngine/Ultracopier/ListThread.cpp +++ b/plugins/CopyEngine/Ultracopier/ListThread.cpp @@ -1160,21 +1160,20 @@ uint64_t ListThread::addToTransfer(const QFileInfo& source,const QFileInfo& dest if(!source.isSymLink()) size=source.size(); const std::string &drive=driveManagement.getDrive(destination.absoluteFilePath().toStdString()); - if(drive.empty()) - abort(); - if(mode!=Ultracopier::Move || drive!=driveManagement.getDrive(source.absoluteFilePath().toStdString())) - { - if(requiredSpace.find(drive)!=requiredSpace.cend()) + if(!drive.empty())//can be a network drive + if(mode!=Ultracopier::Move || drive!=driveManagement.getDrive(source.absoluteFilePath().toStdString())) { - requiredSpace[drive]+=size; - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("space needed add: %1, space needed: %2, on: %3").arg(size).arg(requiredSpace.at(drive)).arg(QString::fromStdString(drive)).toStdString()); - } - else - { - requiredSpace[drive]=size; - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("set space %1 needed, on: %2").arg(size).arg(QString::fromStdString(drive)).toStdString()); + if(requiredSpace.find(drive)!=requiredSpace.cend()) + { + requiredSpace[drive]+=size; + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("space needed add: %1, space needed: %2, on: %3").arg(size).arg(requiredSpace.at(drive)).arg(QString::fromStdString(drive)).toStdString()); + } + else + { + requiredSpace[drive]=size; + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("set space %1 needed, on: %2").arg(size).arg(QString::fromStdString(drive)).toStdString()); + } } - } bytesToTransfer+= size; ActionToDoTransfer temp; temp.id = generateIdNumber(); diff --git a/plugins/CopyEngine/Ultracopier/informations.xml b/plugins/CopyEngine/Ultracopier/informations.xml index 61e04e0..7968ca8 100644 --- a/plugins/CopyEngine/Ultracopier/informations.xml +++ b/plugins/CopyEngine/Ultracopier/informations.xml @@ -17,7 +17,7 @@ - 1.4.0.3 + 1.4.0.4 Ultracopier diff --git a/plugins/Languages/ar/informations.xml b/plugins/Languages/ar/informations.xml index 555ecf1..fcaf807 100644 --- a/plugins/Languages/ar/informations.xml +++ b/plugins/Languages/ar/informations.xml @@ -12,7 +12,7 @@ - 1.4.0.3 + 1.4.0.4 ar diff --git a/plugins/Languages/de/informations.xml b/plugins/Languages/de/informations.xml index c036053..7818c1c 100644 --- a/plugins/Languages/de/informations.xml +++ b/plugins/Languages/de/informations.xml @@ -12,7 +12,7 @@ - 1.4.0.3 + 1.4.0.4 de diff --git a/plugins/Languages/el/informations.xml b/plugins/Languages/el/informations.xml index f82a0d4..dc30cef 100644 --- a/plugins/Languages/el/informations.xml +++ b/plugins/Languages/el/informations.xml @@ -12,7 +12,7 @@ - 1.4.0.3 + 1.4.0.4 el diff --git a/plugins/Languages/es/informations.xml b/plugins/Languages/es/informations.xml index 4c8d150..2113692 100644 --- a/plugins/Languages/es/informations.xml +++ b/plugins/Languages/es/informations.xml @@ -12,7 +12,7 @@ - 1.4.0.3 + 1.4.0.4 es diff --git a/plugins/Languages/fr/informations.xml b/plugins/Languages/fr/informations.xml index e7a4224..437ea90 100644 --- a/plugins/Languages/fr/informations.xml +++ b/plugins/Languages/fr/informations.xml @@ -15,7 +15,7 @@ - 1.4.0.3 + 1.4.0.4 fr diff --git a/plugins/Languages/hi/informations.xml b/plugins/Languages/hi/informations.xml index d0453f3..4c0bc95 100644 --- a/plugins/Languages/hi/informations.xml +++ b/plugins/Languages/hi/informations.xml @@ -12,7 +12,7 @@ - 1.4.0.3 + 1.4.0.4 hi diff --git a/plugins/Languages/hu/informations.xml b/plugins/Languages/hu/informations.xml index 1cee401..77ddd43 100644 --- a/plugins/Languages/hu/informations.xml +++ b/plugins/Languages/hu/informations.xml @@ -12,7 +12,7 @@ - 1.4.0.3 + 1.4.0.4 hu diff --git a/plugins/Languages/id/informations.xml b/plugins/Languages/id/informations.xml index 79ea152..817490b 100644 --- a/plugins/Languages/id/informations.xml +++ b/plugins/Languages/id/informations.xml @@ -12,7 +12,7 @@ - 1.4.0.3 + 1.4.0.4 id diff --git a/plugins/Languages/it/informations.xml b/plugins/Languages/it/informations.xml index 181b891..bd6609d 100644 --- a/plugins/Languages/it/informations.xml +++ b/plugins/Languages/it/informations.xml @@ -12,7 +12,7 @@ - 1.4.0.3 + 1.4.0.4 it diff --git a/plugins/Languages/ja/informations.xml b/plugins/Languages/ja/informations.xml index 7e5e3b6..647c3aa 100644 --- a/plugins/Languages/ja/informations.xml +++ b/plugins/Languages/ja/informations.xml @@ -12,7 +12,7 @@ - 1.4.0.3 + 1.4.0.4 jp diff --git a/plugins/Languages/ko/informations.xml b/plugins/Languages/ko/informations.xml index 6baf140..706afb3 100644 --- a/plugins/Languages/ko/informations.xml +++ b/plugins/Languages/ko/informations.xml @@ -13,7 +13,7 @@ - 1.4.0.3 + 1.4.0.4 ko diff --git a/plugins/Languages/nl/informations.xml b/plugins/Languages/nl/informations.xml index f5d04f8..b50e36b 100644 --- a/plugins/Languages/nl/informations.xml +++ b/plugins/Languages/nl/informations.xml @@ -12,7 +12,7 @@ - 1.4.0.3 + 1.4.0.4 nl diff --git a/plugins/Languages/no/informations.xml b/plugins/Languages/no/informations.xml index 5cb447b..21d465b 100644 --- a/plugins/Languages/no/informations.xml +++ b/plugins/Languages/no/informations.xml @@ -12,7 +12,7 @@ - 1.4.0.3 + 1.4.0.4 no diff --git a/plugins/Languages/pl/informations.xml b/plugins/Languages/pl/informations.xml index 847ef03..7617a00 100644 --- a/plugins/Languages/pl/informations.xml +++ b/plugins/Languages/pl/informations.xml @@ -12,7 +12,7 @@ - 1.4.0.3 + 1.4.0.4 pl diff --git a/plugins/Languages/pt/informations.xml b/plugins/Languages/pt/informations.xml index 744ab32..9c3d0e3 100644 --- a/plugins/Languages/pt/informations.xml +++ b/plugins/Languages/pt/informations.xml @@ -12,7 +12,7 @@ - 1.4.0.3 + 1.4.0.4 pt diff --git a/plugins/Languages/ru/informations.xml b/plugins/Languages/ru/informations.xml index f663205..49ea3f6 100644 --- a/plugins/Languages/ru/informations.xml +++ b/plugins/Languages/ru/informations.xml @@ -12,7 +12,7 @@ - 1.4.0.3 + 1.4.0.4 ru diff --git a/plugins/Languages/th/informations.xml b/plugins/Languages/th/informations.xml index 4bd5bb9..bc66718 100644 --- a/plugins/Languages/th/informations.xml +++ b/plugins/Languages/th/informations.xml @@ -12,7 +12,7 @@ - 1.4.0.3 + 1.4.0.4 th diff --git a/plugins/Languages/tr/informations.xml b/plugins/Languages/tr/informations.xml index f1620ec..bc26b50 100644 --- a/plugins/Languages/tr/informations.xml +++ b/plugins/Languages/tr/informations.xml @@ -12,7 +12,7 @@ - 1.4.0.3 + 1.4.0.4 tr diff --git a/plugins/Languages/zh/informations.xml b/plugins/Languages/zh/informations.xml index 853da7c..ca01be8 100644 --- a/plugins/Languages/zh/informations.xml +++ b/plugins/Languages/zh/informations.xml @@ -12,7 +12,7 @@ - 1.4.0.3 + 1.4.0.4 ch diff --git a/plugins/Languages/zh_TW/informations.xml b/plugins/Languages/zh_TW/informations.xml index fc37a1e..214150d 100644 --- a/plugins/Languages/zh_TW/informations.xml +++ b/plugins/Languages/zh_TW/informations.xml @@ -12,7 +12,7 @@ - 1.4.0.3 + 1.4.0.4 zh_tw diff --git a/plugins/Listener/catchcopy-v0002/informations.xml b/plugins/Listener/catchcopy-v0002/informations.xml index b98adc2..9efc7ce 100644 --- a/plugins/Listener/catchcopy-v0002/informations.xml +++ b/plugins/Listener/catchcopy-v0002/informations.xml @@ -17,7 +17,7 @@ - 1.4.0.3 + 1.4.0.4 catchcopy-v0002 diff --git a/plugins/PluginLoader/catchcopy-v0002/informations.xml b/plugins/PluginLoader/catchcopy-v0002/informations.xml index 9257d3a..95861a6 100644 --- a/plugins/PluginLoader/catchcopy-v0002/informations.xml +++ b/plugins/PluginLoader/catchcopy-v0002/informations.xml @@ -17,7 +17,7 @@ - 1.4.0.3 + 1.4.0.4 catchcopy-v0002 diff --git a/plugins/SessionLoader/Windows/informations.xml b/plugins/SessionLoader/Windows/informations.xml index 1042f96..4bfbab1 100644 --- a/plugins/SessionLoader/Windows/informations.xml +++ b/plugins/SessionLoader/Windows/informations.xml @@ -17,7 +17,7 @@ - 1.4.0.3 + 1.4.0.4 Windows diff --git a/plugins/Themes/Oxygen/Languages/ar/translation.ts b/plugins/Themes/Oxygen/Languages/ar/translation.ts index 483e140..c7b2fdd 100644 --- a/plugins/Themes/Oxygen/Languages/ar/translation.ts +++ b/plugins/Themes/Oxygen/Languages/ar/translation.ts @@ -5,61 +5,67 @@ Themes - + %1 is deprecated, Use %2 - + + + This will be the last version for Mac, but you can compile from source + + + + Buy the Ultimate version to fund development - + File %1/%2, size: %3/%4 - + Copy list - + Move list - + Don't close if errors are found - + Never close - + Always close - + File Name, 0KB - - - + + + Select a color - - - + + + %1 %2% of %3 @@ -67,24 +73,24 @@ ThemesFactory - + Don't close if errors are found - + Never close - + Always close - - - + + + Select a color diff --git a/plugins/Themes/Oxygen/Languages/de/translation.ts b/plugins/Themes/Oxygen/Languages/de/translation.ts index 74d215d..8f51f95 100644 --- a/plugins/Themes/Oxygen/Languages/de/translation.ts +++ b/plugins/Themes/Oxygen/Languages/de/translation.ts @@ -5,61 +5,67 @@ Themes - + %1 is deprecated, Use %2 - + + + This will be the last version for Mac, but you can compile from source + + + + Buy the Ultimate version to fund development Kaufe die Ultimate Version um die Entwicklung zu finanzieren - + File %1/%2, size: %3/%4 Datei %1/%2, Größe:%3/%4 - + Copy list Zu kopierende Dateien - + Move list Zu verschiebende Dateien - + Don't close if errors are found Nicht schließen, wenn Fehler aufgetreten sind - + Never close Niemals schließen - + Always close Immer schließen - + File Name, 0KB Dateiname, 0KB - - - + + + Select a color Farbe auswählen - - - + + + %1 %2% of %3 @@ -67,24 +73,24 @@ ThemesFactory - + Don't close if errors are found Nicht schließen, wenn Fehler aufgetreten sind - + Never close Niemals schließen - + Always close Immer schließen - - - + + + Select a color Wählen Sie eine Farbe diff --git a/plugins/Themes/Oxygen/Languages/el/translation.ts b/plugins/Themes/Oxygen/Languages/el/translation.ts index 483e140..c7b2fdd 100644 --- a/plugins/Themes/Oxygen/Languages/el/translation.ts +++ b/plugins/Themes/Oxygen/Languages/el/translation.ts @@ -5,61 +5,67 @@ Themes - + %1 is deprecated, Use %2 - + + + This will be the last version for Mac, but you can compile from source + + + + Buy the Ultimate version to fund development - + File %1/%2, size: %3/%4 - + Copy list - + Move list - + Don't close if errors are found - + Never close - + Always close - + File Name, 0KB - - - + + + Select a color - - - + + + %1 %2% of %3 @@ -67,24 +73,24 @@ ThemesFactory - + Don't close if errors are found - + Never close - + Always close - - - + + + Select a color diff --git a/plugins/Themes/Oxygen/Languages/en/translation.ts b/plugins/Themes/Oxygen/Languages/en/translation.ts index 6cbd884..73e399d 100644 --- a/plugins/Themes/Oxygen/Languages/en/translation.ts +++ b/plugins/Themes/Oxygen/Languages/en/translation.ts @@ -5,61 +5,67 @@ Themes - + %1 is deprecated, Use %2 - + + + This will be the last version for Mac, but you can compile from source + + + + Buy the Ultimate version to fund development - + File %1/%2, size: %3/%4 - + Copy list - + Move list - + Don't close if errors are found - + Never close - + Always close - + File Name, 0KB - - - + + + Select a color - - - + + + %1 %2% of %3 @@ -67,24 +73,24 @@ ThemesFactory - + Don't close if errors are found - + Never close - + Always close - - - + + + Select a color diff --git a/plugins/Themes/Oxygen/Languages/es/translation.ts b/plugins/Themes/Oxygen/Languages/es/translation.ts index 46b67a9..fff5a9c 100644 --- a/plugins/Themes/Oxygen/Languages/es/translation.ts +++ b/plugins/Themes/Oxygen/Languages/es/translation.ts @@ -5,61 +5,67 @@ Themes - + %1 is deprecated, Use %2 - + + + This will be the last version for Mac, but you can compile from source + + + + Buy the Ultimate version to fund development Comprar la versión Ultimate para financiar el desarrollo - + File %1/%2, size: %3/%4 El archivo %1/%2, el tamaño: %3/%4 - + Copy list Lista de copia - + Move list Lista de movimiento - + Don't close if errors are found No cierre si se encuentran errores - + Never close Nunca cierre - + Always close Siempre cerrar - + File Name, 0KB Nombre de archivo, 0KB - - - + + + Select a color Seleccione un color - - - + + + %1 %2% of %3 @@ -67,24 +73,24 @@ ThemesFactory - + Don't close if errors are found No cierre si se encuentran errores - + Never close Nunca cierre - + Always close Siempre cerrar - - - + + + Select a color Seleccione un color diff --git a/plugins/Themes/Oxygen/Languages/fr/translation.ts b/plugins/Themes/Oxygen/Languages/fr/translation.ts index 9a89964..c3aa909 100644 --- a/plugins/Themes/Oxygen/Languages/fr/translation.ts +++ b/plugins/Themes/Oxygen/Languages/fr/translation.ts @@ -5,10 +5,16 @@ Themes - + %1 is deprecated, Use %2 + + + + This will be the last version for Mac, but you can compile from source + + Buy the Ultimate version to fund development @@ -67,7 +73,7 @@ ThemesFactory - + Don't close if errors are found Garder ouvert s'il y a des erreurs diff --git a/plugins/Themes/Oxygen/Languages/hi/translation.ts b/plugins/Themes/Oxygen/Languages/hi/translation.ts index 483e140..c7b2fdd 100644 --- a/plugins/Themes/Oxygen/Languages/hi/translation.ts +++ b/plugins/Themes/Oxygen/Languages/hi/translation.ts @@ -5,61 +5,67 @@ Themes - + %1 is deprecated, Use %2 - + + + This will be the last version for Mac, but you can compile from source + + + + Buy the Ultimate version to fund development - + File %1/%2, size: %3/%4 - + Copy list - + Move list - + Don't close if errors are found - + Never close - + Always close - + File Name, 0KB - - - + + + Select a color - - - + + + %1 %2% of %3 @@ -67,24 +73,24 @@ ThemesFactory - + Don't close if errors are found - + Never close - + Always close - - - + + + Select a color diff --git a/plugins/Themes/Oxygen/Languages/hu/translation.ts b/plugins/Themes/Oxygen/Languages/hu/translation.ts index ecf3eb5..409e6ea 100644 --- a/plugins/Themes/Oxygen/Languages/hu/translation.ts +++ b/plugins/Themes/Oxygen/Languages/hu/translation.ts @@ -5,61 +5,67 @@ Themes - + %1 is deprecated, Use %2 - + + + This will be the last version for Mac, but you can compile from source + + + + Buy the Ultimate version to fund development Vásárold meg az Ultimate verziót a fejlesztés támogatásához - + File %1/%2, size: %3/%4 Fájl %1/%2, méret: %3/%4 - + Copy list Lista másolása - + Move list Lista mozgatása - + Don't close if errors are found Ne zárja be, ha hiba történik - + Never close Sose zárja be - + Always close Mindig zárja be - + File Name, 0KB Fájlnév, 0KB - - - + + + Select a color Válassz egy színt - - - + + + %1 %2% of %3 @@ -67,24 +73,24 @@ ThemesFactory - + Don't close if errors are found Ne zárja be, ha hiba történik - + Never close Sose zárja be - + Always close Mindig zárja be - - - + + + Select a color Válassz egy színt diff --git a/plugins/Themes/Oxygen/Languages/id/translation.ts b/plugins/Themes/Oxygen/Languages/id/translation.ts index 483e140..c7b2fdd 100644 --- a/plugins/Themes/Oxygen/Languages/id/translation.ts +++ b/plugins/Themes/Oxygen/Languages/id/translation.ts @@ -5,61 +5,67 @@ Themes - + %1 is deprecated, Use %2 - + + + This will be the last version for Mac, but you can compile from source + + + + Buy the Ultimate version to fund development - + File %1/%2, size: %3/%4 - + Copy list - + Move list - + Don't close if errors are found - + Never close - + Always close - + File Name, 0KB - - - + + + Select a color - - - + + + %1 %2% of %3 @@ -67,24 +73,24 @@ ThemesFactory - + Don't close if errors are found - + Never close - + Always close - - - + + + Select a color diff --git a/plugins/Themes/Oxygen/Languages/it/translation.ts b/plugins/Themes/Oxygen/Languages/it/translation.ts index 5ca6a07..c813017 100644 --- a/plugins/Themes/Oxygen/Languages/it/translation.ts +++ b/plugins/Themes/Oxygen/Languages/it/translation.ts @@ -5,61 +5,67 @@ Themes - + %1 is deprecated, Use %2 - + + + This will be the last version for Mac, but you can compile from source + + + + Buy the Ultimate version to fund development Acquista la versione Ultimate per finanziare lo sviluppo del programma - + File %1/%2, size: %3/%4 File %1/%2, dimensione: %3/%4 - + Copy list Lista della copia - + Move list Lista dello spostamento - + Don't close if errors are found Non chiudere se vengono rilevati errori - + Never close Non chiudere mai - + Always close Chiudere sempre - + File Name, 0KB Nome del file, 0KB - - - + + + Select a color Scegliere un colore - - - + + + %1 %2% of %3 %1 %2% di %3 @@ -67,24 +73,24 @@ ThemesFactory - + Don't close if errors are found Non chiudere se vengono rilevati errori - + Never close Non chiudere mai - + Always close Chiudere sempre - - - + + + Select a color Scegliere un colore diff --git a/plugins/Themes/Oxygen/Languages/ja/translation.ts b/plugins/Themes/Oxygen/Languages/ja/translation.ts index facdce1..2099b73 100644 --- a/plugins/Themes/Oxygen/Languages/ja/translation.ts +++ b/plugins/Themes/Oxygen/Languages/ja/translation.ts @@ -5,61 +5,67 @@ Themes - + %1 is deprecated, Use %2 - + + + This will be the last version for Mac, but you can compile from source + + + + Buy the Ultimate version to fund development - + File %1/%2, size: %3/%4 - + Copy list - + Move list - + Don't close if errors are found - + Never close - + Always close - + File Name, 0KB - - - + + + Select a color - - - + + + %1 %2% of %3 @@ -67,24 +73,24 @@ ThemesFactory - + Don't close if errors are found - + Never close - + Always close - - - + + + Select a color diff --git a/plugins/Themes/Oxygen/Languages/ko/translation.ts b/plugins/Themes/Oxygen/Languages/ko/translation.ts index 86a2b04..c446d72 100644 --- a/plugins/Themes/Oxygen/Languages/ko/translation.ts +++ b/plugins/Themes/Oxygen/Languages/ko/translation.ts @@ -5,10 +5,16 @@ Themes - + %1 is deprecated, Use %2 + + + + This will be the last version for Mac, but you can compile from source + + Buy the Ultimate version to fund development @@ -67,7 +73,7 @@ ThemesFactory - + Don't close if errors are found 오류 발견시 종료 안함 diff --git a/plugins/Themes/Oxygen/Languages/nl/translation.ts b/plugins/Themes/Oxygen/Languages/nl/translation.ts index 483e140..c7b2fdd 100644 --- a/plugins/Themes/Oxygen/Languages/nl/translation.ts +++ b/plugins/Themes/Oxygen/Languages/nl/translation.ts @@ -5,61 +5,67 @@ Themes - + %1 is deprecated, Use %2 - + + + This will be the last version for Mac, but you can compile from source + + + + Buy the Ultimate version to fund development - + File %1/%2, size: %3/%4 - + Copy list - + Move list - + Don't close if errors are found - + Never close - + Always close - + File Name, 0KB - - - + + + Select a color - - - + + + %1 %2% of %3 @@ -67,24 +73,24 @@ ThemesFactory - + Don't close if errors are found - + Never close - + Always close - - - + + + Select a color diff --git a/plugins/Themes/Oxygen/Languages/no/translation.ts b/plugins/Themes/Oxygen/Languages/no/translation.ts index 483e140..c7b2fdd 100644 --- a/plugins/Themes/Oxygen/Languages/no/translation.ts +++ b/plugins/Themes/Oxygen/Languages/no/translation.ts @@ -5,61 +5,67 @@ Themes - + %1 is deprecated, Use %2 - + + + This will be the last version for Mac, but you can compile from source + + + + Buy the Ultimate version to fund development - + File %1/%2, size: %3/%4 - + Copy list - + Move list - + Don't close if errors are found - + Never close - + Always close - + File Name, 0KB - - - + + + Select a color - - - + + + %1 %2% of %3 @@ -67,24 +73,24 @@ ThemesFactory - + Don't close if errors are found - + Never close - + Always close - - - + + + Select a color diff --git a/plugins/Themes/Oxygen/Languages/pl/translation.ts b/plugins/Themes/Oxygen/Languages/pl/translation.ts index 483e140..c7b2fdd 100644 --- a/plugins/Themes/Oxygen/Languages/pl/translation.ts +++ b/plugins/Themes/Oxygen/Languages/pl/translation.ts @@ -5,61 +5,67 @@ Themes - + %1 is deprecated, Use %2 - + + + This will be the last version for Mac, but you can compile from source + + + + Buy the Ultimate version to fund development - + File %1/%2, size: %3/%4 - + Copy list - + Move list - + Don't close if errors are found - + Never close - + Always close - + File Name, 0KB - - - + + + Select a color - - - + + + %1 %2% of %3 @@ -67,24 +73,24 @@ ThemesFactory - + Don't close if errors are found - + Never close - + Always close - - - + + + Select a color diff --git a/plugins/Themes/Oxygen/Languages/pt/translation.ts b/plugins/Themes/Oxygen/Languages/pt/translation.ts index 483e140..c7b2fdd 100644 --- a/plugins/Themes/Oxygen/Languages/pt/translation.ts +++ b/plugins/Themes/Oxygen/Languages/pt/translation.ts @@ -5,61 +5,67 @@ Themes - + %1 is deprecated, Use %2 - + + + This will be the last version for Mac, but you can compile from source + + + + Buy the Ultimate version to fund development - + File %1/%2, size: %3/%4 - + Copy list - + Move list - + Don't close if errors are found - + Never close - + Always close - + File Name, 0KB - - - + + + Select a color - - - + + + %1 %2% of %3 @@ -67,24 +73,24 @@ ThemesFactory - + Don't close if errors are found - + Never close - + Always close - - - + + + Select a color diff --git a/plugins/Themes/Oxygen/Languages/ru/translation.ts b/plugins/Themes/Oxygen/Languages/ru/translation.ts index ac18a39..1ef7093 100644 --- a/plugins/Themes/Oxygen/Languages/ru/translation.ts +++ b/plugins/Themes/Oxygen/Languages/ru/translation.ts @@ -5,61 +5,67 @@ Themes - + %1 is deprecated, Use %2 - + + + This will be the last version for Mac, but you can compile from source + + + + Buy the Ultimate version to fund development - + File %1/%2, size: %3/%4 Файл %1/%2, размер: %3/%4 - + Copy list Копировать список - + Move list - + Don't close if errors are found Не закрывать, если найдены ошибки - + Never close Никогда не закрывать - + Always close Всегда закрывайте - + File Name, 0KB Имя файла, 0KB - - - + + + Select a color - - - + + + %1 %2% of %3 @@ -67,24 +73,24 @@ ThemesFactory - + Don't close if errors are found Не закрывать, если найдены ошибки - + Never close Никогда не закрывать - + Always close Всегда закрывайте - - - + + + Select a color diff --git a/plugins/Themes/Oxygen/Languages/th/translation.ts b/plugins/Themes/Oxygen/Languages/th/translation.ts index 483e140..c7b2fdd 100644 --- a/plugins/Themes/Oxygen/Languages/th/translation.ts +++ b/plugins/Themes/Oxygen/Languages/th/translation.ts @@ -5,61 +5,67 @@ Themes - + %1 is deprecated, Use %2 - + + + This will be the last version for Mac, but you can compile from source + + + + Buy the Ultimate version to fund development - + File %1/%2, size: %3/%4 - + Copy list - + Move list - + Don't close if errors are found - + Never close - + Always close - + File Name, 0KB - - - + + + Select a color - - - + + + %1 %2% of %3 @@ -67,24 +73,24 @@ ThemesFactory - + Don't close if errors are found - + Never close - + Always close - - - + + + Select a color diff --git a/plugins/Themes/Oxygen/Languages/tr/translation.ts b/plugins/Themes/Oxygen/Languages/tr/translation.ts index 483e140..c7b2fdd 100644 --- a/plugins/Themes/Oxygen/Languages/tr/translation.ts +++ b/plugins/Themes/Oxygen/Languages/tr/translation.ts @@ -5,61 +5,67 @@ Themes - + %1 is deprecated, Use %2 - + + + This will be the last version for Mac, but you can compile from source + + + + Buy the Ultimate version to fund development - + File %1/%2, size: %3/%4 - + Copy list - + Move list - + Don't close if errors are found - + Never close - + Always close - + File Name, 0KB - - - + + + Select a color - - - + + + %1 %2% of %3 @@ -67,24 +73,24 @@ ThemesFactory - + Don't close if errors are found - + Never close - + Always close - - - + + + Select a color diff --git a/plugins/Themes/Oxygen/Languages/zh/translation.ts b/plugins/Themes/Oxygen/Languages/zh/translation.ts index facdce1..2099b73 100644 --- a/plugins/Themes/Oxygen/Languages/zh/translation.ts +++ b/plugins/Themes/Oxygen/Languages/zh/translation.ts @@ -5,61 +5,67 @@ Themes - + %1 is deprecated, Use %2 - + + + This will be the last version for Mac, but you can compile from source + + + + Buy the Ultimate version to fund development - + File %1/%2, size: %3/%4 - + Copy list - + Move list - + Don't close if errors are found - + Never close - + Always close - + File Name, 0KB - - - + + + Select a color - - - + + + %1 %2% of %3 @@ -67,24 +73,24 @@ ThemesFactory - + Don't close if errors are found - + Never close - + Always close - - - + + + Select a color diff --git a/plugins/Themes/Oxygen/informations.xml b/plugins/Themes/Oxygen/informations.xml index 6cfe489..f03f832 100644 --- a/plugins/Themes/Oxygen/informations.xml +++ b/plugins/Themes/Oxygen/informations.xml @@ -17,7 +17,7 @@ - 1.4.0.3 + 1.4.0.4 Oxygen diff --git a/plugins/Themes/Supercopier/informations.xml b/plugins/Themes/Supercopier/informations.xml index 476e5f5..d5cb35e 100644 --- a/plugins/Themes/Supercopier/informations.xml +++ b/plugins/Themes/Supercopier/informations.xml @@ -17,7 +17,7 @@ - 1.4.0.3 + 1.4.0.4 Supercopier diff --git a/resources/Languages/en/informations.xml b/resources/Languages/en/informations.xml index 979d729..8b998f0 100644 --- a/resources/Languages/en/informations.xml +++ b/resources/Languages/en/informations.xml @@ -12,7 +12,7 @@ - 1.4.0.3 + 1.4.0.4 en