From 4ef2beed86d60f1f8750d54a554eda31fc531747 Mon Sep 17 00:00:00 2001 From: learn_more Date: Sat, 19 Mar 2016 19:54:18 +0100 Subject: [PATCH] r70915 [RAPPS] Display error messages on download failures. Patch by toe_head2001. Thank you! + some additional italian translations. + some additional russian translations. + some additional taiwanese translations. --- src/base/applications/rapps_new/lang/bg-BG.rc | 2 ++ src/base/applications/rapps_new/lang/cs-CZ.rc | 2 ++ src/base/applications/rapps_new/lang/de-DE.rc | 2 ++ src/base/applications/rapps_new/lang/en-US.rc | 2 ++ src/base/applications/rapps_new/lang/es-ES.rc | 4 +++- src/base/applications/rapps_new/lang/fr-FR.rc | 2 ++ src/base/applications/rapps_new/lang/he-IL.rc | 2 ++ src/base/applications/rapps_new/lang/it-IT.rc | 8 +++++--- src/base/applications/rapps_new/lang/ja-JP.rc | 2 ++ src/base/applications/rapps_new/lang/no-NO.rc | 2 ++ src/base/applications/rapps_new/lang/pl-PL.rc | 2 ++ src/base/applications/rapps_new/lang/pt-BR.rc | 2 ++ src/base/applications/rapps_new/lang/ro-RO.rc | 2 ++ src/base/applications/rapps_new/lang/ru-RU.rc | 20 +++++++++++--------- src/base/applications/rapps_new/lang/sk-SK.rc | 2 ++ src/base/applications/rapps_new/lang/sq-AL.rc | 2 ++ src/base/applications/rapps_new/lang/sv-SE.rc | 2 ++ src/base/applications/rapps_new/lang/tr-TR.rc | 2 ++ src/base/applications/rapps_new/lang/uk-UA.rc | 2 ++ src/base/applications/rapps_new/lang/zh-CN.rc | 2 ++ src/base/applications/rapps_new/lang/zh-TW.rc | 14 ++++++++------ src/base/applications/rapps_new/loaddlg.cpp | 22 ++++++++++++++++++++-- src/base/applications/rapps_new/resource.h | 2 ++ 23 files changed, 83 insertions(+), 21 deletions(-) diff --git a/src/base/applications/rapps_new/lang/bg-BG.rc b/src/base/applications/rapps_new/lang/bg-BG.rc index f6546e5..54e4890 100644 --- a/src/base/applications/rapps_new/lang/bg-BG.rc +++ b/src/base/applications/rapps_new/lang/bg-BG.rc @@ -204,4 +204,6 @@ BEGIN IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed." IDS_INTEG_CHECK_TITLE "Verifying package integrity..." IDS_INTEG_CHECK_FAIL "The package did not pass the integrity check, it may have been corrupted or tampered with during downloading. Running the software is not recommended." + IDS_INTERRUPTED_DOWNLOAD "The download was interrupted. Check connection to Internet." + IDS_UNABLE_TO_WRITE "Unable to write to disk. Disk may be at capacity." END diff --git a/src/base/applications/rapps_new/lang/cs-CZ.rc b/src/base/applications/rapps_new/lang/cs-CZ.rc index bc0c34c..111e6c4 100644 --- a/src/base/applications/rapps_new/lang/cs-CZ.rc +++ b/src/base/applications/rapps_new/lang/cs-CZ.rc @@ -205,4 +205,6 @@ BEGIN IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed." IDS_INTEG_CHECK_TITLE "Verifying package integrity..." IDS_INTEG_CHECK_FAIL "The package did not pass the integrity check, it may have been corrupted or tampered with during downloading. Running the software is not recommended." + IDS_INTERRUPTED_DOWNLOAD "The download was interrupted. Check connection to Internet." + IDS_UNABLE_TO_WRITE "Unable to write to disk. Disk may be at capacity." END diff --git a/src/base/applications/rapps_new/lang/de-DE.rc b/src/base/applications/rapps_new/lang/de-DE.rc index 891452d..066b522 100644 --- a/src/base/applications/rapps_new/lang/de-DE.rc +++ b/src/base/applications/rapps_new/lang/de-DE.rc @@ -200,4 +200,6 @@ BEGIN IDS_CERT_DOES_NOT_MATCH "Überprüfung des SSL-Zertifikats fehlgeschlagen." IDS_INTEG_CHECK_TITLE "Verifying package integrity..." IDS_INTEG_CHECK_FAIL "The package did not pass the integrity check, it may have been corrupted or tampered with during downloading. Running the software is not recommended." + IDS_INTERRUPTED_DOWNLOAD "The download was interrupted. Check connection to Internet." + IDS_UNABLE_TO_WRITE "Unable to write to disk. Disk may be at capacity." END diff --git a/src/base/applications/rapps_new/lang/en-US.rc b/src/base/applications/rapps_new/lang/en-US.rc index ab3cd52..464a8a1 100644 --- a/src/base/applications/rapps_new/lang/en-US.rc +++ b/src/base/applications/rapps_new/lang/en-US.rc @@ -200,4 +200,6 @@ BEGIN IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed." IDS_INTEG_CHECK_TITLE "Verifying package integrity..." IDS_INTEG_CHECK_FAIL "The package did not pass the integrity check, it may have been corrupted or tampered with during downloading. Running the software is not recommended." + IDS_INTERRUPTED_DOWNLOAD "The download was interrupted. Check connection to Internet." + IDS_UNABLE_TO_WRITE "Unable to write to disk. Disk may be at capacity." END diff --git a/src/base/applications/rapps_new/lang/es-ES.rc b/src/base/applications/rapps_new/lang/es-ES.rc index 1187ddd..f2e22de 100644 --- a/src/base/applications/rapps_new/lang/es-ES.rc +++ b/src/base/applications/rapps_new/lang/es-ES.rc @@ -1,5 +1,5 @@ /* Spanish Language resource file. - * Translated by: ?? and Ismael Ferreras Morezuelas <2014-11-07> */ + * Translated by: ?? and Ismael Ferreras Morezuelas (Swyter) <2014-11-07> */ LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL @@ -203,4 +203,6 @@ BEGIN IDS_CERT_DOES_NOT_MATCH "Ha fallado la comprobación del certificado SSL." IDS_INTEG_CHECK_TITLE "Verificando integridad del paquete..." IDS_INTEG_CHECK_FAIL "El paquete no ha pasado la comprobación de integridad, puede haber sido alterado o estar corrupto. No se recomienda ejecutarlo." + IDS_INTERRUPTED_DOWNLOAD "Se ha interrumpido la descarga por un error de red. Comprueba la conexión a Internet." + IDS_UNABLE_TO_WRITE "No se ha podido escribir en el disco duro, es posible que no quede espacio libre." END diff --git a/src/base/applications/rapps_new/lang/fr-FR.rc b/src/base/applications/rapps_new/lang/fr-FR.rc index 3560f3a..9cc3878 100644 --- a/src/base/applications/rapps_new/lang/fr-FR.rc +++ b/src/base/applications/rapps_new/lang/fr-FR.rc @@ -200,4 +200,6 @@ BEGIN IDS_CERT_DOES_NOT_MATCH "La vérification du certificat SSL a échoué." IDS_INTEG_CHECK_TITLE "Vérification de l'intégrité du paquet..." IDS_INTEG_CHECK_FAIL "Le contrôle d'intégrité du paquet a échoué, il se peut qu'il ait été corrompu ou altéré au cours du téléchargement. L'exécution du programme n'est pas recommandée." + IDS_INTERRUPTED_DOWNLOAD "The download was interrupted. Check connection to Internet." + IDS_UNABLE_TO_WRITE "Unable to write to disk. Disk may be at capacity." END diff --git a/src/base/applications/rapps_new/lang/he-IL.rc b/src/base/applications/rapps_new/lang/he-IL.rc index 821bdf5..251e436 100644 --- a/src/base/applications/rapps_new/lang/he-IL.rc +++ b/src/base/applications/rapps_new/lang/he-IL.rc @@ -202,4 +202,6 @@ BEGIN IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed." IDS_INTEG_CHECK_TITLE "Verifying package integrity..." IDS_INTEG_CHECK_FAIL "The package did not pass the integrity check, it may have been corrupted or tampered with during downloading. Running the software is not recommended." + IDS_INTERRUPTED_DOWNLOAD "The download was interrupted. Check connection to Internet." + IDS_UNABLE_TO_WRITE "Unable to write to disk. Disk may be at capacity." END diff --git a/src/base/applications/rapps_new/lang/it-IT.rc b/src/base/applications/rapps_new/lang/it-IT.rc index 7339c28..c5454fc 100644 --- a/src/base/applications/rapps_new/lang/it-IT.rc +++ b/src/base/applications/rapps_new/lang/it-IT.rc @@ -197,7 +197,9 @@ BEGIN IDS_INFORMATION "Informazioni" IDS_UNABLE_TO_DOWNLOAD "Impossibile scaricare il pacchetto! Indirizzo non trovato!" IDS_UNABLE_TO_REMOVE "Impossibile cancellare i dati dal registro!" - IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed." - IDS_INTEG_CHECK_TITLE "Verifying package integrity..." - IDS_INTEG_CHECK_FAIL "The package did not pass the integrity check, it may have been corrupted or tampered with during downloading. Running the software is not recommended." + IDS_CERT_DOES_NOT_MATCH "Verifica del certificato SSL fallita." + IDS_INTEG_CHECK_TITLE "Verifica integrit pacchetto..." + IDS_INTEG_CHECK_FAIL "Il pacchetto non ha superato il controllo di integrit, potrebbe essere stato danneggiato o manomesso durante lo scaricamento. L'esecuzione del software non raccomandata." + IDS_INTERRUPTED_DOWNLOAD "The download was interrupted. Check connection to Internet." + IDS_UNABLE_TO_WRITE "Unable to write to disk. Disk may be at capacity." END diff --git a/src/base/applications/rapps_new/lang/ja-JP.rc b/src/base/applications/rapps_new/lang/ja-JP.rc index 7c4bf85..878c045 100644 --- a/src/base/applications/rapps_new/lang/ja-JP.rc +++ b/src/base/applications/rapps_new/lang/ja-JP.rc @@ -200,4 +200,6 @@ BEGIN IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed." IDS_INTEG_CHECK_TITLE "Verifying package integrity..." IDS_INTEG_CHECK_FAIL "The package did not pass the integrity check, it may have been corrupted or tampered with during downloading. Running the software is not recommended." + IDS_INTERRUPTED_DOWNLOAD "The download was interrupted. Check connection to Internet." + IDS_UNABLE_TO_WRITE "Unable to write to disk. Disk may be at capacity." END diff --git a/src/base/applications/rapps_new/lang/no-NO.rc b/src/base/applications/rapps_new/lang/no-NO.rc index b40b68b..94181a1 100644 --- a/src/base/applications/rapps_new/lang/no-NO.rc +++ b/src/base/applications/rapps_new/lang/no-NO.rc @@ -200,4 +200,6 @@ BEGIN IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed." IDS_INTEG_CHECK_TITLE "Verifying package integrity..." IDS_INTEG_CHECK_FAIL "The package did not pass the integrity check, it may have been corrupted or tampered with during downloading. Running the software is not recommended." + IDS_INTERRUPTED_DOWNLOAD "The download was interrupted. Check connection to Internet." + IDS_UNABLE_TO_WRITE "Unable to write to disk. Disk may be at capacity." END diff --git a/src/base/applications/rapps_new/lang/pl-PL.rc b/src/base/applications/rapps_new/lang/pl-PL.rc index 63b43d9..4b71ec0 100644 --- a/src/base/applications/rapps_new/lang/pl-PL.rc +++ b/src/base/applications/rapps_new/lang/pl-PL.rc @@ -208,4 +208,6 @@ BEGIN IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed." IDS_INTEG_CHECK_TITLE "Verifying package integrity..." IDS_INTEG_CHECK_FAIL "The package did not pass the integrity check, it may have been corrupted or tampered with during downloading. Running the software is not recommended." + IDS_INTERRUPTED_DOWNLOAD "The download was interrupted. Check connection to Internet." + IDS_UNABLE_TO_WRITE "Unable to write to disk. Disk may be at capacity." END diff --git a/src/base/applications/rapps_new/lang/pt-BR.rc b/src/base/applications/rapps_new/lang/pt-BR.rc index 72f0034..9b2f88d 100644 --- a/src/base/applications/rapps_new/lang/pt-BR.rc +++ b/src/base/applications/rapps_new/lang/pt-BR.rc @@ -202,4 +202,6 @@ BEGIN IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed." IDS_INTEG_CHECK_TITLE "Verifying package integrity..." IDS_INTEG_CHECK_FAIL "The package did not pass the integrity check, it may have been corrupted or tampered with during downloading. Running the software is not recommended." + IDS_INTERRUPTED_DOWNLOAD "The download was interrupted. Check connection to Internet." + IDS_UNABLE_TO_WRITE "Unable to write to disk. Disk may be at capacity." END diff --git a/src/base/applications/rapps_new/lang/ro-RO.rc b/src/base/applications/rapps_new/lang/ro-RO.rc index bcafeb1..414c9dc 100644 --- a/src/base/applications/rapps_new/lang/ro-RO.rc +++ b/src/base/applications/rapps_new/lang/ro-RO.rc @@ -206,4 +206,6 @@ BEGIN IDS_CERT_DOES_NOT_MATCH "Verificarea certificatului SSL a eșuat." IDS_INTEG_CHECK_TITLE "Se verifică integritatea pachetului…" IDS_INTEG_CHECK_FAIL "Pachetul nu a trecut de verificarea de integritate. Utilizarea programului nu este recomandată." + IDS_INTERRUPTED_DOWNLOAD "The download was interrupted. Check connection to Internet." + IDS_UNABLE_TO_WRITE "Unable to write to disk. Disk may be at capacity." END diff --git a/src/base/applications/rapps_new/lang/ru-RU.rc b/src/base/applications/rapps_new/lang/ru-RU.rc index 5360fee..5600ba2 100644 --- a/src/base/applications/rapps_new/lang/ru-RU.rc +++ b/src/base/applications/rapps_new/lang/ru-RU.rc @@ -23,7 +23,7 @@ BEGIN POPUP "Справка" BEGIN MENUITEM "Содержание\tF1", ID_HELP, GRAYED - MENUITEM "О программе", ID_ABOUT + MENUITEM "О программе...", ID_ABOUT END END @@ -66,12 +66,12 @@ BEGIN EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | ES_AUTOHSCROLL PUSHBUTTON "В&ыбрать", IDC_CHOOSE, 187, 85, 50, 14 AUTOCHECKBOX "&Удалять инсталляторы программ после установки", IDC_DEL_AFTER_INSTALL, 16, 100, 218, 12 - GROUPBOX "Proxy", -1, 4, 116, 240, 76 - CONTROL "System proxy settings", IDC_PROXY_DEFAULT, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 130, 210, 10 - CONTROL "Direct (No proxy)", IDC_NO_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 145, 210, 10 - CONTROL "Proxy", IDC_USE_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 160, 74, 10 + GROUPBOX "Прокси", -1, 4, 116, 240, 76 + CONTROL "Системные настройки прокси", IDC_PROXY_DEFAULT, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 130, 210, 10 + CONTROL "Без прокси", IDC_NO_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 145, 210, 10 + CONTROL "Прокси", IDC_USE_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 160, 74, 10 EDITTEXT IDC_PROXY_SERVER, 90, 160, 147, 12, ES_AUTOHSCROLL | WS_DISABLED - LTEXT "No proxy for", -1, 27, 175, 64, 10 + LTEXT "Исключения", -1, 27, 175, 64, 10 EDITTEXT IDC_NO_PROXY_FOR, 90, 175, 147, 12, ES_AUTOHSCROLL | WS_DISABLED PUSHBUTTON "По умолчанию", IDC_DEFAULT_SETTINGS, 8, 195, 60, 14 PUSHBUTTON "OK", IDOK, 116, 195, 60, 14 @@ -141,7 +141,7 @@ BEGIN IDS_INFO_UPDATEINFO "\nИнформация об обновлениях: " IDS_INFO_INFOABOUT "\nИнформация о программе: " IDS_INFO_COMMENTS "\nКомментарии: " - IDS_INFO_INSTLOCATION "\nУстановлено в: " + IDS_INFO_INSTLOCATION "\nПуть установки: " IDS_INFO_INSTALLSRC "\nИсточник установки: " IDS_INFO_UNINSTALLSTR "\nСтрока для удаления: " IDS_INFO_MODIFYPATH "\nСтрока для изменения: " @@ -192,12 +192,14 @@ BEGIN IDS_UPDATES "Обновления" IDS_APPLICATIONS "Приложения" IDS_CHOOSE_FOLDER_TEXT "Выберите папку, которая будет использоваться для загрузки программ:" - IDS_CHOOSE_FOLDER_ERROR "Вы указали несуществующую папку!" + IDS_CHOOSE_FOLDER_ERROR "Указанная вами папка не существует. Создать?" IDS_APP_REG_REMOVE "Вы действительно хотите удалить данные об установленной программе из реестра?" IDS_INFORMATION "Информация" - IDS_UNABLE_TO_DOWNLOAD "Unable to download the package! Address not found!" + IDS_UNABLE_TO_DOWNLOAD "Не удалось скачать приложение! Не найден адрес!" IDS_UNABLE_TO_REMOVE "Не удалось удалить данные о программе из реестра!" IDS_CERT_DOES_NOT_MATCH "Ошибка проверки SSL сертификата." IDS_INTEG_CHECK_TITLE "Проверка целостности приложения..." IDS_INTEG_CHECK_FAIL "Приложение не прошло проверку целостности, возможно оно было повреждено или подменено. Запуск приложения не рекомендуется." + IDS_INTERRUPTED_DOWNLOAD "The download was interrupted. Check connection to Internet." + IDS_UNABLE_TO_WRITE "Unable to write to disk. Disk may be at capacity." END diff --git a/src/base/applications/rapps_new/lang/sk-SK.rc b/src/base/applications/rapps_new/lang/sk-SK.rc index 23096ed..1ef6344 100644 --- a/src/base/applications/rapps_new/lang/sk-SK.rc +++ b/src/base/applications/rapps_new/lang/sk-SK.rc @@ -205,4 +205,6 @@ BEGIN IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed." IDS_INTEG_CHECK_TITLE "Verifying package integrity..." IDS_INTEG_CHECK_FAIL "The package did not pass the integrity check, it may have been corrupted or tampered with during downloading. Running the software is not recommended." + IDS_INTERRUPTED_DOWNLOAD "The download was interrupted. Check connection to Internet." + IDS_UNABLE_TO_WRITE "Unable to write to disk. Disk may be at capacity." END diff --git a/src/base/applications/rapps_new/lang/sq-AL.rc b/src/base/applications/rapps_new/lang/sq-AL.rc index cf1e1bb..4a6d1af 100644 --- a/src/base/applications/rapps_new/lang/sq-AL.rc +++ b/src/base/applications/rapps_new/lang/sq-AL.rc @@ -204,4 +204,6 @@ BEGIN IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed." IDS_INTEG_CHECK_TITLE "Verifying package integrity..." IDS_INTEG_CHECK_FAIL "The package did not pass the integrity check, it may have been corrupted or tampered with during downloading. Running the software is not recommended." + IDS_INTERRUPTED_DOWNLOAD "The download was interrupted. Check connection to Internet." + IDS_UNABLE_TO_WRITE "Unable to write to disk. Disk may be at capacity." END diff --git a/src/base/applications/rapps_new/lang/sv-SE.rc b/src/base/applications/rapps_new/lang/sv-SE.rc index 232235a..4e3b944 100644 --- a/src/base/applications/rapps_new/lang/sv-SE.rc +++ b/src/base/applications/rapps_new/lang/sv-SE.rc @@ -207,4 +207,6 @@ BEGIN IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed." IDS_INTEG_CHECK_TITLE "Verifying package integrity..." IDS_INTEG_CHECK_FAIL "The package did not pass the integrity check, it may have been corrupted or tampered with during downloading. Running the software is not recommended." + IDS_INTERRUPTED_DOWNLOAD "The download was interrupted. Check connection to Internet." + IDS_UNABLE_TO_WRITE "Unable to write to disk. Disk may be at capacity." END diff --git a/src/base/applications/rapps_new/lang/tr-TR.rc b/src/base/applications/rapps_new/lang/tr-TR.rc index d618db7..b10e8c8 100644 --- a/src/base/applications/rapps_new/lang/tr-TR.rc +++ b/src/base/applications/rapps_new/lang/tr-TR.rc @@ -202,4 +202,6 @@ BEGIN IDS_CERT_DOES_NOT_MATCH "SSL onay belgesi doğrulaması başarısız." IDS_INTEG_CHECK_TITLE "Paket bütünlüğü doğrulanıyor..." IDS_INTEG_CHECK_FAIL "Paket bütünlük denetimini geçmedi, bozulmuş veyâ indirme esnâsında oynanmış olabilir. Yazılımı çalıştırmak önerilmez." + IDS_INTERRUPTED_DOWNLOAD "İndirme kesildi. Umûmî Ağ bağlantınızı denetleyiniz." + IDS_UNABLE_TO_WRITE "Diske yazılamıyor. Disk dolu olabilir." END diff --git a/src/base/applications/rapps_new/lang/uk-UA.rc b/src/base/applications/rapps_new/lang/uk-UA.rc index 38ccd46..626fa4c 100644 --- a/src/base/applications/rapps_new/lang/uk-UA.rc +++ b/src/base/applications/rapps_new/lang/uk-UA.rc @@ -208,4 +208,6 @@ BEGIN IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed." IDS_INTEG_CHECK_TITLE "Verifying package integrity..." IDS_INTEG_CHECK_FAIL "The package did not pass the integrity check, it may have been corrupted or tampered with during downloading. Running the software is not recommended." + IDS_INTERRUPTED_DOWNLOAD "The download was interrupted. Check connection to Internet." + IDS_UNABLE_TO_WRITE "Unable to write to disk. Disk may be at capacity." END diff --git a/src/base/applications/rapps_new/lang/zh-CN.rc b/src/base/applications/rapps_new/lang/zh-CN.rc index 3c2ca6f..906ba62 100644 --- a/src/base/applications/rapps_new/lang/zh-CN.rc +++ b/src/base/applications/rapps_new/lang/zh-CN.rc @@ -202,4 +202,6 @@ BEGIN IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed." IDS_INTEG_CHECK_TITLE "Verifying package integrity..." IDS_INTEG_CHECK_FAIL "The package did not pass the integrity check, it may have been corrupted or tampered with during downloading. Running the software is not recommended." + IDS_INTERRUPTED_DOWNLOAD "The download was interrupted. Check connection to Internet." + IDS_UNABLE_TO_WRITE "Unable to write to disk. Disk may be at capacity." END diff --git a/src/base/applications/rapps_new/lang/zh-TW.rc b/src/base/applications/rapps_new/lang/zh-TW.rc index 7cba547..1dd1174 100644 --- a/src/base/applications/rapps_new/lang/zh-TW.rc +++ b/src/base/applications/rapps_new/lang/zh-TW.rc @@ -68,12 +68,12 @@ BEGIN EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | ES_AUTOHSCROLL PUSHBUTTON "選擇(&C)", IDC_CHOOSE, 187, 85, 50, 14 AUTOCHECKBOX "在安裝完程式後刪除安裝程式(&D)", IDC_DEL_AFTER_INSTALL, 16, 100, 218, 12 - GROUPBOX "Proxy", -1, 4, 116, 240, 76 - CONTROL "System proxy settings", IDC_PROXY_DEFAULT, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 130, 210, 10 - CONTROL "Direct (No proxy)", IDC_NO_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 145, 210, 10 - CONTROL "Proxy", IDC_USE_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 160, 74, 10 + GROUPBOX "代理", -1, 4, 116, 240, 76 + CONTROL "系統代理設置", IDC_PROXY_DEFAULT, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 130, 210, 10 + CONTROL "直接 (無代理)", IDC_NO_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 145, 210, 10 + CONTROL "代理", IDC_USE_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 160, 74, 10 EDITTEXT IDC_PROXY_SERVER, 90, 160, 147, 12, ES_AUTOHSCROLL | WS_DISABLED - LTEXT "No proxy for", -1, 27, 175, 64, 10 + LTEXT "沒有代理", -1, 27, 175, 64, 10 EDITTEXT IDC_NO_PROXY_FOR, 90, 175, 147, 12, ES_AUTOHSCROLL | WS_DISABLED PUSHBUTTON "預設", IDC_DEFAULT_SETTINGS, 8, 195, 60, 14 PUSHBUTTON "確定", IDOK, 116, 195, 60, 14 @@ -197,9 +197,11 @@ BEGIN IDS_CHOOSE_FOLDER_ERROR "您選擇的資料夾不存在。創建嗎？" IDS_APP_REG_REMOVE "您確定要從登錄檔刪除該程式的資料嗎？" IDS_INFORMATION "資訊" - IDS_UNABLE_TO_DOWNLOAD "Unable to download the package! Address not found!" + IDS_UNABLE_TO_DOWNLOAD "無法下載包!找不到的位址!" IDS_UNABLE_TO_REMOVE "無法從登錄檔刪除該程式的資料！" IDS_CERT_DOES_NOT_MATCH "SSL 憑證驗證失敗。" IDS_INTEG_CHECK_TITLE "驗證套裝軟體的完整性..." IDS_INTEG_CHECK_FAIL "包沒有通過完整性檢查，它可能已損壞，或者在下載過程中篡改。建議您不要運行該軟體。" + IDS_INTERRUPTED_DOWNLOAD "The download was interrupted. Check connection to Internet." + IDS_UNABLE_TO_WRITE "Unable to write to disk. Disk may be at capacity." END diff --git a/src/base/applications/rapps_new/loaddlg.cpp b/src/base/applications/rapps_new/loaddlg.cpp index d859b35..c248f48 100644 --- a/src/base/applications/rapps_new/loaddlg.cpp +++ b/src/base/applications/rapps_new/loaddlg.cpp @@ -418,8 +418,26 @@ ThreadFunc(LPVOID Context) do { - if (!InternetReadFile(hFile, lpBuffer, _countof(lpBuffer), &dwBytesRead)) goto end; - if (!WriteFile(hOut, &lpBuffer[0], dwBytesRead, &dwBytesWritten, NULL)) goto end; + if (!InternetReadFile(hFile, lpBuffer, _countof(lpBuffer), &dwBytesRead)) + { + WCHAR szMsgText[MAX_STR_LEN]; + + if (!LoadStringW(hInst, IDS_INTERRUPTED_DOWNLOAD, szMsgText, _countof(szMsgText))) + goto end; + + MessageBoxW(hMainWnd, szMsgText, NULL, MB_OK | MB_ICONERROR); + goto end; + } + if (!WriteFile(hOut, &lpBuffer[0], dwBytesRead, &dwBytesWritten, NULL)) + { + WCHAR szMsgText[MAX_STR_LEN]; + + if (!LoadStringW(hInst, IDS_UNABLE_TO_WRITE, szMsgText, _countof(szMsgText))) + goto end; + + MessageBoxW(hMainWnd, szMsgText, NULL, MB_OK | MB_ICONERROR); + goto end; + } dwCurrentBytesRead += dwBytesRead; dl->OnProgress(dwCurrentBytesRead, dwContentLen, 0, AppInfo->szUrlDownload); } diff --git a/src/base/applications/rapps_new/resource.h b/src/base/applications/rapps_new/resource.h index 25638be..6459fd9 100644 --- a/src/base/applications/rapps_new/resource.h +++ b/src/base/applications/rapps_new/resource.h @@ -99,6 +99,8 @@ #define IDS_CERT_DOES_NOT_MATCH 120 #define IDS_INTEG_CHECK_TITLE 121 #define IDS_INTEG_CHECK_FAIL 122 +#define IDS_INTERRUPTED_DOWNLOAD 123 +#define IDS_UNABLE_TO_WRITE 124 /* Tooltips */ #define IDS_TOOLTIP_INSTALL 200 -- 2.7.0.windows.2