Skip to content

Commit 054ed7c

Browse files
setvisiblesetvisible
committed
Merge branch 'feature-updates' into develop
2 parents 6077035 + bb2cf34 commit 054ed7c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

70 files changed

+22023
-8034
lines changed

‎.tx/config

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,20 +9,20 @@ source_file = src/locale/arrowdl_en_US.ts
99
source_lang = en
1010
type = QT
1111
minimum_perc = 0
12-
lang_map = ar_EG: ar_EG, de_DE: de_DE, en_US: en_US, es_ES: es_ES, fr_FR: fr_FR, hu_HU: hu_HU, it_IT: it_IT, ja_JP: ja_JP, ko_KR: ko_KR, nl_NL: nl_NL, pl_PL: pl_PL, pt_BR: pt_BR, pt_PT: pt_PT, ru_RU: ru_RU, vi_VN: vi_VN, zh_CN: zh_CN
12+
lang_map = ar_EG: ar_EG, de_DE: de_DE, en_US: en_US, es_BO: es_BO, es_ES: es_ES, es_US: es_US, fr_FR: fr_FR, hu_HU: hu_HU, it_IT: it_IT, ja_JP: ja_JP, ko_KR: ko_KR, nl_NL: nl_NL, pl_PL: pl_PL, pt_BR: pt_BR, pt_PT: pt_PT, ru_RU: ru_RU, vi_VN: vi_VN, zh_CN: zh_CN, zh_TW: zh_TW
1313

1414
[o:arrowdl:p:arrowdl:r:web-extension]
1515
file_filter = web-extension/extension/src/base/_locales/<lang>/messages.json
1616
source_file = web-extension/extension/src/base/_locales/en/messages.json
1717
source_lang = en
1818
type = CHROME
1919
minimum_perc = 0
20-
lang_map = ar_EG: ar, de_DE: de, en_US: en, es_ES: es, fr_FR: fr, hu_HU: hu, it_IT: it, ja_JP: ja, ko_KR: ko, nl_NL: nl, pl_PL: pl, pt_BR: pt_BR, pt_PT: pt_PT, ru_RU: ru, vi_VN: vi, zh_CN: zh_CN
20+
lang_map = ar_EG: ar, de_DE: de, en_US: en, es_BO: es_BO, es_ES: es_ES, es_US: es_US, fr_FR: fr, hu_HU: hu, it_IT: it, ja_JP: ja, ko_KR: ko, nl_NL: nl, pl_PL: pl, pt_BR: pt_BR, pt_PT: pt_PT, ru_RU: ru, vi_VN: vi, zh_CN: zh_CN, zh_TW: zh_TW
2121

2222
[o:arrowdl:p:arrowdl:r:windows-installer]
2323
file_filter = installer/windows/NSIS/i18n/sources/<lang>.json
2424
source_file = installer/windows/NSIS/i18n/sources/en.json
2525
source_lang = en
2626
type = KEYVALUEJSON
27-
lang_map = ar_EG: ar, de_DE: de, en_US: en, es_ES: es, fr_FR: fr, hu_HU: hu, it_IT: it, ja_JP: ja, ko_KR: ko, nl_NL: nl, pl_PL: pl, pt_BR: pt_BR, pt_PT: pt, ru_RU: ru, vi_VN: vi, zh_CN: zh_CN
27+
lang_map = ar_EG: ar, de_DE: de, en_US: en, es_BO: es_BO, es_ES: es_ES, es_US: es_US, fr_FR: fr, hu_HU: hu, it_IT: it, ja_JP: ja, ko_KR: ko, nl_NL: nl, pl_PL: pl, pt_BR: pt_BR, pt_PT: pt, ru_RU: ru, vi_VN: vi, zh_CN: zh_CN, zh_TW: zh_TW
2828

‎3rd/yt-dlp/bin/yt-dlp

7.08 KB
Binary file not shown.

‎3rd/yt-dlp/bin/yt-dlp.exe

10.2 KB
Binary file not shown.

‎3rd/yt-dlp/version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2024.07.25
1+
2024.08.06

‎TRANSLATORS.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@ To add the language 'xx' in country 'XX':
1515

1616
2. Go to Transifex > Language > Add the language > Add xx_XX
1717

18+
https://app.transifex.com/arrowdl/arrowdl/languages/
19+
20+
1821
3. Add following line to `qt_add_translations(...)` in `./src/CMakeLists.txt`:
1922

2023
${CMAKE_SOURCE_DIR}/src/locale/arrowdl_xx_XX.ts

‎installer/windows/NSIS/i18n/sources/es_BO.json

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"DESC_SectionMainApplication": "The main application.",
3+
"DESC_SectionLauncher": "The launcher, used for messaging with web browser.",
4+
"DESC_SectionStartMenuShortcut": "Create Start Menu Shortcut.",
5+
"DESC_SectionDesktopShortcut": "Create Desktop Shortcut.",
6+
"DESC_UninstallIconDescription": "Uninstall ArrowDL",
7+
"DESC_ApplicationSession": "Application (required)",
8+
"DESC_LauncherSession": "Launcher (required)",
9+
"DESC_StartMenuGroupSession": "Start Menu Shortcut",
10+
"DESC_DesktopShortcutSession": "Desktop Shortcut",
11+
"DESC_VisitWebSite": "Visit our website:"
12+
}

‎installer/windows/NSIS/i18n/sources/es_ES.json

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"DESC_SectionMainApplication": "La aplicación principal.",
3+
"DESC_SectionLauncher": "El lanzador, utilizado para enviar mensajes con el navegador web.",
4+
"DESC_SectionStartMenuShortcut": "Crear acceso directo al menú Inicio.",
5+
"DESC_SectionDesktopShortcut": "Crear acceso directo del Escritorio.",
6+
"DESC_UninstallIconDescription": "Desinstalar ArrowDL",
7+
"DESC_ApplicationSession": "Solicitud (requerida)",
8+
"DESC_LauncherSession": "Lanzador (requerido)",
9+
"DESC_StartMenuGroupSession": "Acceso directo del menú Inicio",
10+
"DESC_DesktopShortcutSession": "Acceso directo del Escritorio",
11+
"DESC_VisitWebSite": "Visite nuestro sitio web:"
12+
}

‎installer/windows/NSIS/i18n/sources/es_US.json

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"DESC_SectionMainApplication": "The main application.",
3+
"DESC_SectionLauncher": "The launcher, used for messaging with web browser.",
4+
"DESC_SectionStartMenuShortcut": "Create Start Menu Shortcut.",
5+
"DESC_SectionDesktopShortcut": "Create Desktop Shortcut.",
6+
"DESC_UninstallIconDescription": "Uninstall ArrowDL",
7+
"DESC_ApplicationSession": "Application (required)",
8+
"DESC_LauncherSession": "Launcher (required)",
9+
"DESC_StartMenuGroupSession": "Start Menu Shortcut",
10+
"DESC_DesktopShortcutSession": "Desktop Shortcut",
11+
"DESC_VisitWebSite": "Visit our website:"
12+
}

‎installer/windows/NSIS/i18n/sources/ru.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
{
22
"DESC_SectionMainApplication": "Основное приложение.",
3-
"DESC_SectionLauncher": "Программа запуска, используемая для обмена сообщениями с веб-браузером.",
4-
"DESC_SectionStartMenuShortcut": "Создайте ярлык меню Пуск.",
3+
"DESC_SectionLauncher": "Дополнительная программа, использующаяся для обмена сообщениями с веб-браузерами. Нужна для работы браузерных расширений.",
4+
"DESC_SectionStartMenuShortcut": "Создать ярлыки в меню Пуск.",
55
"DESC_SectionDesktopShortcut": "Создать ярлык на рабочем столе.",
66
"DESC_UninstallIconDescription": "Удалить ArrowDL",
7-
"DESC_ApplicationSession": "Заявление (обязательно)",
8-
"DESC_LauncherSession": "Пусковая установка (обязательно)",
9-
"DESC_StartMenuGroupSession": "Ярлык меню Пуск",
10-
"DESC_DesktopShortcutSession": "Ярлык рабочего стола",
7+
"DESC_ApplicationSession": "Программа (обязательно)",
8+
"DESC_LauncherSession": "Лаунчер (обязательно)",
9+
"DESC_StartMenuGroupSession": "Ярлык в меню Пуск",
10+
"DESC_DesktopShortcutSession": "Ярлык на Рабочем столе",
1111
"DESC_VisitWebSite": "Посетите наш сайт:"
1212
}

‎installer/windows/NSIS/i18n/sources/zh_TW.json

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"DESC_SectionMainApplication": "主要應應用程式。",
3+
"DESC_SectionLauncher": "啟動器用於通過 Web 瀏覽器傳遞訊息。",
4+
"DESC_SectionStartMenuShortcut": "建立開始選單捷徑。",
5+
"DESC_SectionDesktopShortcut": "建立桌面捷徑。",
6+
"DESC_UninstallIconDescription": "解除安裝 ArrowDL",
7+
"DESC_ApplicationSession": "應用程式（必須）",
8+
"DESC_LauncherSession": "啟動器（必須）",
9+
"DESC_StartMenuGroupSession": "開始選單捷徑",
10+
"DESC_DesktopShortcutSession": "桌面捷徑",
11+
"DESC_VisitWebSite": "前往我們的網站："
12+
}

‎src/CMakeLists.txt

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,10 +74,12 @@ target_compile_definitions(${TARGET_NAME}
7474

7575
qt_add_translations(${TARGET_NAME}
7676
TS_FILES
77-
${CMAKE_SOURCE_DIR}/src/locale/arrowdl_ar_EG.ts # Arabic
77+
${CMAKE_SOURCE_DIR}/src/locale/arrowdl_ar_EG.ts # Arabic (Egypt)
7878
${CMAKE_SOURCE_DIR}/src/locale/arrowdl_de_DE.ts # German
7979
${CMAKE_SOURCE_DIR}/src/locale/arrowdl_en_US.ts # English (default)
80-
${CMAKE_SOURCE_DIR}/src/locale/arrowdl_es_ES.ts # Spanish
80+
${CMAKE_SOURCE_DIR}/src/locale/arrowdl_es_BO.ts # Spanish (Bolivia)
81+
${CMAKE_SOURCE_DIR}/src/locale/arrowdl_es_ES.ts # Spanish (Spain)
82+
${CMAKE_SOURCE_DIR}/src/locale/arrowdl_es_US.ts # Spanish (United States)
8183
${CMAKE_SOURCE_DIR}/src/locale/arrowdl_fr_FR.ts # French
8284
${CMAKE_SOURCE_DIR}/src/locale/arrowdl_hu_HU.ts # Hungarian
8385
${CMAKE_SOURCE_DIR}/src/locale/arrowdl_it_IT.ts # Italian
@@ -90,6 +92,7 @@ qt_add_translations(${TARGET_NAME}
9092
${CMAKE_SOURCE_DIR}/src/locale/arrowdl_ru_RU.ts # Russian
9193
${CMAKE_SOURCE_DIR}/src/locale/arrowdl_vi_VN.ts # Vietnamese
9294
${CMAKE_SOURCE_DIR}/src/locale/arrowdl_zh_CN.ts # Chinese (Simplified & Traditional)
95+
${CMAKE_SOURCE_DIR}/src/locale/arrowdl_zh_TW.ts # Chinese (Taiwan)
9396
QM_FILES_OUTPUT_VARIABLE
9497
qm_files
9598
)

‎src/core/downloaditem.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,7 @@ QString DownloadItem::statusToHttp(QNetworkReply::NetworkError error)
309309
case QNetworkReply::InternalServerError: return tr("500 Internal server error");
310310
case QNetworkReply::OperationNotImplementedError: return tr("501 Server does not support this functionality");
311311
case QNetworkReply::ServiceUnavailableError: return tr("503 Service unavailable");
312-
case QNetworkReply::UnknownServerError: return tr("5xx Unknown serveur error");
312+
case QNetworkReply::UnknownServerError: return tr("5xx Unknown server error");
313313
}
314314
Q_UNREACHABLE();
315315
}

‎src/core/settings.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ Settings::Settings(QObject *parent) : AbstractSettings(parent)
155155
// Tab General
156156
ExistingFileOption Settings::existingFileOption() const
157157
{
158-
int value = getSettingInt(REGISTRY_EXISTING_FILE);
158+
auto value = getSettingInt(REGISTRY_EXISTING_FILE);
159159
return (value >= 0 && value < static_cast<int>(ExistingFileOption::LastOption))
160160
? static_cast<ExistingFileOption>(value)
161161
: ExistingFileOption::Skip;
@@ -185,13 +185,13 @@ void Settings::setLanguage(const QString &language)
185185
*/
186186
QMap<QString, QVariant> Settings::theme() const
187187
{
188-
const QString str = getSettingString(REGISTRY_UI_THEME);
188+
auto str = getSettingString(REGISTRY_UI_THEME);
189189
return deserialize(str);
190190
}
191191

192192
void Settings::setTheme(const QMap<QString, QVariant> &map)
193193
{
194-
const QString value = serialize(map);
194+
auto value = serialize(map);
195195
setSettingString(REGISTRY_UI_THEME, value);
196196
}
197197

@@ -736,13 +736,13 @@ void Settings::setTorrentPeers(const QString &value)
736736
/* Other (advanced) settings */
737737
QMap<QString, QVariant> Settings::torrentSettings() const
738738
{
739-
const QString str = getSettingString(REGISTRY_TORRENT_ADVANCED);
739+
auto str = getSettingString(REGISTRY_TORRENT_ADVANCED);
740740
return deserialize(str);
741741
}
742742

743743
void Settings::setTorrentSettings(const QMap<QString, QVariant> &map)
744744
{
745-
const QString value = serialize(map);
745+
auto value = serialize(map);
746746
setSettingString(REGISTRY_TORRENT_ADVANCED, value);
747747
}
748748

‎src/core/torrentcontext_p.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,8 @@
6565

6666

6767
/* Show the thread, of which the debug message comes from */
68-
#define qDebug_1 qDebug() << " + | "
69-
#define qDebug_2 qDebug() << " | + "
68+
#define qDebug_1 qDebug() << " + | " // from TorrentContextPrivate
69+
#define qDebug_2 qDebug() << " | + " // from WorkerThread
7070

7171
using namespace Qt::Literals::StringLiterals;
7272

‎src/dialogs/batchrenamedialog.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,8 +127,9 @@ void BatchRenameDialog::renameToEnumeration()
127127

128128
void BatchRenameDialog::rename(DownloadItem *downloadItem, const QString &newName)
129129
{
130-
if (!downloadItem)
130+
if (!downloadItem) {
131131
return;
132+
}
132133

133134
if (ui->safeRenameCheckBox->isChecked()) {
134135
auto resource = downloadItem->resource();

‎src/io/filewriter.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,13 @@
2727
FileWriter::FileWriter(QIODevice *device)
2828
: m_device(device)
2929
{
30+
m_errorString = FileWriter::tr("Unknown error");
3031
}
3132

3233
FileWriter::FileWriter(const QString &fileName)
3334
: m_device(new QFile(fileName))
3435
{
36+
m_errorString = FileWriter::tr("Unknown error");
3537
}
3638

3739
FileWriter::~FileWriter()

‎src/io/filewriter.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ class FileWriter
5959

6060
/* Error */
6161
FileWriter::FileWriterError m_fileWriterError = UnknownError;
62-
QString m_errorString = FileWriter::tr("Unknown error");
62+
QString m_errorString = {};
6363

6464
Q_DISABLE_COPY(FileWriter)
6565
};

0 commit comments

Comments
 (0)