From: Daniel Reimer Date: Thu, 29 Sep 2016 21:31:11 +0000 (+0000) Subject: [RAPPS_NEW] X-Git-Tag: ReactOS-0.4.3~191 X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=ad3aa035db7477fb074cf0446788c48e3dbc4db4 [RAPPS_NEW] When Internet connection is down. Rapps does not generate any msg by Rama Teja Gampa + GIT -> SVN Patch manual translation + Bitrot fixes + Tabs -> Spaces fixes CORE-10980 #resolve #comment Committed, thx ^^ svn path=/trunk/; revision=72864 --- diff --git a/reactos/base/applications/rapps_new/lang/bg-BG.rc b/reactos/base/applications/rapps_new/lang/bg-BG.rc index bd1ccd01195..2dd67e4ee28 100644 --- a/reactos/base/applications/rapps_new/lang/bg-BG.rc +++ b/reactos/base/applications/rapps_new/lang/bg-BG.rc @@ -201,6 +201,7 @@ BEGIN IDS_APP_REG_REMOVE "Уверен ли сте, че искате да изтриете данните за сложеното приложение от регистъра?" IDS_INFORMATION "Сведения" IDS_UNABLE_TO_DOWNLOAD "Unable to download the package! Address not found!" + IDS_UNABLE_TO_DOWNLOAD2 "Unable to download the package! Check Internet Connection!" IDS_UNABLE_TO_REMOVE "Премахването на данните за приложението от регистъра е невъзможно!" IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed." IDS_INTEG_CHECK_TITLE "Verifying package integrity..." diff --git a/reactos/base/applications/rapps_new/lang/cs-CZ.rc b/reactos/base/applications/rapps_new/lang/cs-CZ.rc index 13bde09c029..648bfc88fd5 100644 --- a/reactos/base/applications/rapps_new/lang/cs-CZ.rc +++ b/reactos/base/applications/rapps_new/lang/cs-CZ.rc @@ -202,6 +202,7 @@ BEGIN IDS_APP_REG_REMOVE "Určitě odstranit data instalovaného programu z registru?" IDS_INFORMATION "Informace" IDS_UNABLE_TO_DOWNLOAD "Soubor se nepodařilo stáhnout! Adresa nenalezena!" + IDS_UNABLE_TO_DOWNLOAD2 "Unable to download the package! Check Internet Connection!" IDS_UNABLE_TO_REMOVE "Nepodařilo se odstranit data programu z registru!" IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed." IDS_INTEG_CHECK_TITLE "Verifying package integrity..." diff --git a/reactos/base/applications/rapps_new/lang/de-DE.rc b/reactos/base/applications/rapps_new/lang/de-DE.rc index 5d9a5125165..c49926b2c9a 100644 --- a/reactos/base/applications/rapps_new/lang/de-DE.rc +++ b/reactos/base/applications/rapps_new/lang/de-DE.rc @@ -196,7 +196,8 @@ BEGIN IDS_CHOOSE_FOLDER_ERROR "Sie haben ein nicht existierendes Verzeichnis angegeben! Neu anlegen?" IDS_APP_REG_REMOVE "Sind Sie sich sicher, dass Sie die Daten dieses Programms aus der Registry entfernen möchten?" IDS_INFORMATION "Informationen" - IDS_UNABLE_TO_DOWNLOAD "Unable to download the package! Address not found!" + IDS_UNABLE_TO_DOWNLOAD "Paket konnte nicht geladen werden! Addresse wurde nicht gefunden!" + IDS_UNABLE_TO_DOWNLOAD2 "Paket konnte nicht geladen werden! Prüfen Sie Ihre Internetverbindung!" IDS_UNABLE_TO_REMOVE "Konnte die Daten nicht aus der Registry löschen!" IDS_CERT_DOES_NOT_MATCH "Überprüfung des SSL-Zertifikats fehlgeschlagen." IDS_INTEG_CHECK_TITLE "Verifying package integrity..." diff --git a/reactos/base/applications/rapps_new/lang/en-US.rc b/reactos/base/applications/rapps_new/lang/en-US.rc index 9a2275eba20..943fee2e95e 100644 --- a/reactos/base/applications/rapps_new/lang/en-US.rc +++ b/reactos/base/applications/rapps_new/lang/en-US.rc @@ -197,6 +197,7 @@ BEGIN IDS_APP_REG_REMOVE "Are you sure you want to delete the data on the installed program from the registry?" IDS_INFORMATION "Information" IDS_UNABLE_TO_DOWNLOAD "Unable to download the package! Address not found!" + IDS_UNABLE_TO_DOWNLOAD2 "Unable to download the package! Check Internet Connection!" IDS_UNABLE_TO_REMOVE "Unable to remove data on the program from the registry!" IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed." IDS_INTEG_CHECK_TITLE "Verifying package integrity..." diff --git a/reactos/base/applications/rapps_new/lang/es-ES.rc b/reactos/base/applications/rapps_new/lang/es-ES.rc index 4548fbbdc6d..a2808c11546 100644 --- a/reactos/base/applications/rapps_new/lang/es-ES.rc +++ b/reactos/base/applications/rapps_new/lang/es-ES.rc @@ -200,6 +200,7 @@ BEGIN IDS_APP_REG_REMOVE "¿Está seguro de querer borrar del Registro los datos de instalación del programa?" IDS_INFORMATION "Información" IDS_UNABLE_TO_DOWNLOAD "No se pudo descargar el paquete. No se ha encontrado la dirección de Internet." + IDS_UNABLE_TO_DOWNLOAD2 "Unable to download the package! Check Internet Connection!" IDS_UNABLE_TO_REMOVE "No se pudieron borrar del Registro los datos de instalación del programa." IDS_CERT_DOES_NOT_MATCH "Ha fallado la comprobación del certificado SSL." IDS_INTEG_CHECK_TITLE "Verificando integridad del paquete..." diff --git a/reactos/base/applications/rapps_new/lang/fr-FR.rc b/reactos/base/applications/rapps_new/lang/fr-FR.rc index ce2f80976bb..e9213eb4675 100644 --- a/reactos/base/applications/rapps_new/lang/fr-FR.rc +++ b/reactos/base/applications/rapps_new/lang/fr-FR.rc @@ -197,6 +197,7 @@ BEGIN IDS_APP_REG_REMOVE "Êtes-vous sûr de vouloir supprimer du registre les données du programme installé ?" IDS_INFORMATION "Information" IDS_UNABLE_TO_DOWNLOAD "Impossible de télécharger le paquet : adresse introuvable !" + IDS_UNABLE_TO_DOWNLOAD2 "Unable to download the package! Check Internet Connection!" IDS_UNABLE_TO_REMOVE "Impossible de supprimer du registre les données du programme !" 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..." diff --git a/reactos/base/applications/rapps_new/lang/he-IL.rc b/reactos/base/applications/rapps_new/lang/he-IL.rc index 012862d48bc..e486da1aa0b 100644 --- a/reactos/base/applications/rapps_new/lang/he-IL.rc +++ b/reactos/base/applications/rapps_new/lang/he-IL.rc @@ -199,6 +199,7 @@ BEGIN IDS_APP_REG_REMOVE "Are you sure you want to delete the data on the installed program from the registry?" IDS_INFORMATION "מידע" IDS_UNABLE_TO_DOWNLOAD "Unable to download the package! Address not found!" + IDS_UNABLE_TO_DOWNLOAD2 "Unable to download the package! Check Internet Connection!" IDS_UNABLE_TO_REMOVE "Unable to remove data on the program from the registry!" IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed." IDS_INTEG_CHECK_TITLE "Verifying package integrity..." diff --git a/reactos/base/applications/rapps_new/lang/it-IT.rc b/reactos/base/applications/rapps_new/lang/it-IT.rc index d4cd6c4c620..7387dd3de5f 100644 --- a/reactos/base/applications/rapps_new/lang/it-IT.rc +++ b/reactos/base/applications/rapps_new/lang/it-IT.rc @@ -197,6 +197,7 @@ BEGIN IDS_APP_REG_REMOVE "Sicuro di voler cancellare dal registro i dati sui programmi installati?" IDS_INFORMATION "Informazioni" IDS_UNABLE_TO_DOWNLOAD "Impossibile scaricare il pacchetto! Indirizzo non trovato!" + IDS_UNABLE_TO_DOWNLOAD2 "Unable to download the package! Check Internet Connection!" IDS_UNABLE_TO_REMOVE "Impossibile cancellare i dati dal registro!" IDS_CERT_DOES_NOT_MATCH "Verifica del certificato SSL fallita." IDS_INTEG_CHECK_TITLE "Verifica integrità pacchetto..." diff --git a/reactos/base/applications/rapps_new/lang/ja-JP.rc b/reactos/base/applications/rapps_new/lang/ja-JP.rc index 96d7bde17f6..3cedf418b06 100644 --- a/reactos/base/applications/rapps_new/lang/ja-JP.rc +++ b/reactos/base/applications/rapps_new/lang/ja-JP.rc @@ -197,6 +197,7 @@ BEGIN IDS_APP_REG_REMOVE "レジストリからインストールされたプログラムに関するデータを削除してもよろしいですか?" IDS_INFORMATION "情報" IDS_UNABLE_TO_DOWNLOAD "Unable to download the package! Address not found!" + IDS_UNABLE_TO_DOWNLOAD2 "Unable to download the package! Check Internet Connection!" IDS_UNABLE_TO_REMOVE "レジストリからこのプログラムに関するデータを削除できません!" IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed." IDS_INTEG_CHECK_TITLE "Verifying package integrity..." diff --git a/reactos/base/applications/rapps_new/lang/no-NO.rc b/reactos/base/applications/rapps_new/lang/no-NO.rc index b2bd08fb075..137d10adc6e 100644 --- a/reactos/base/applications/rapps_new/lang/no-NO.rc +++ b/reactos/base/applications/rapps_new/lang/no-NO.rc @@ -197,6 +197,7 @@ BEGIN IDS_APP_REG_REMOVE "Are you sure you want to delete the data on the installed program from the registry?" IDS_INFORMATION "Information" IDS_UNABLE_TO_DOWNLOAD "Unable to download the package! Address not found!" + IDS_UNABLE_TO_DOWNLOAD2 "Unable to download the package! Check Internet Connection!" IDS_UNABLE_TO_REMOVE "Unable to remove data on the program from the registry!" IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed." IDS_INTEG_CHECK_TITLE "Verifying package integrity..." diff --git a/reactos/base/applications/rapps_new/lang/pl-PL.rc b/reactos/base/applications/rapps_new/lang/pl-PL.rc index e0fbad67425..24d90c3fc6f 100644 --- a/reactos/base/applications/rapps_new/lang/pl-PL.rc +++ b/reactos/base/applications/rapps_new/lang/pl-PL.rc @@ -205,6 +205,7 @@ BEGIN IDS_APP_REG_REMOVE "Czy na pewno chcesz usunąć wpis tego programu z rejestru?" IDS_INFORMATION "Informacja" IDS_UNABLE_TO_DOWNLOAD "Nie można pobrać pakietu! Nie znaleziono adresu!" + IDS_UNABLE_TO_DOWNLOAD2 "Unable to download the package! Check Internet Connection!" IDS_UNABLE_TO_REMOVE "Nie można było usunąć wpisu z rejestru!" IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed." IDS_INTEG_CHECK_TITLE "Verifying package integrity..." diff --git a/reactos/base/applications/rapps_new/lang/pt-BR.rc b/reactos/base/applications/rapps_new/lang/pt-BR.rc index 948456c2321..5acc3b3d120 100644 --- a/reactos/base/applications/rapps_new/lang/pt-BR.rc +++ b/reactos/base/applications/rapps_new/lang/pt-BR.rc @@ -199,6 +199,7 @@ BEGIN IDS_APP_REG_REMOVE "Você tem certeza que deseja apagar as informações do programa instalado do registro?" IDS_INFORMATION "Informações" IDS_UNABLE_TO_DOWNLOAD "Unable to download the package! Address not found!" + IDS_UNABLE_TO_DOWNLOAD2 "Unable to download the package! Check Internet Connection!" IDS_UNABLE_TO_REMOVE "Não foi possível remover as informações do programa do registro!" IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed." IDS_INTEG_CHECK_TITLE "Verifying package integrity..." diff --git a/reactos/base/applications/rapps_new/lang/ro-RO.rc b/reactos/base/applications/rapps_new/lang/ro-RO.rc index 03e033b8de3..85895ed5691 100644 --- a/reactos/base/applications/rapps_new/lang/ro-RO.rc +++ b/reactos/base/applications/rapps_new/lang/ro-RO.rc @@ -203,6 +203,7 @@ BEGIN IDS_APP_REG_REMOVE "Sigur doriți să ștergeți datele din registru pentru această aplicațe?" IDS_INFORMATION "Informație" IDS_UNABLE_TO_DOWNLOAD "Pachetul nu poate fi descărcat! Adresa nu este găsită!" + IDS_UNABLE_TO_DOWNLOAD2 "Unable to download the package! Check Internet Connection!" IDS_UNABLE_TO_REMOVE "Nu se pot elimina datele din registru pentru acest program!" IDS_CERT_DOES_NOT_MATCH "Verificarea certificatului SSL a eșuat." IDS_INTEG_CHECK_TITLE "Se verifică integritatea pachetului…" diff --git a/reactos/base/applications/rapps_new/lang/ru-RU.rc b/reactos/base/applications/rapps_new/lang/ru-RU.rc index 31996aae0ad..a2b57dd6f8a 100644 --- a/reactos/base/applications/rapps_new/lang/ru-RU.rc +++ b/reactos/base/applications/rapps_new/lang/ru-RU.rc @@ -197,6 +197,7 @@ BEGIN IDS_APP_REG_REMOVE "Вы действительно хотите удалить данные об установленной программе из реестра?" IDS_INFORMATION "Информация" IDS_UNABLE_TO_DOWNLOAD "Не удалось скачать приложение! Не найден адрес!" + IDS_UNABLE_TO_DOWNLOAD2 "Unable to download the package! Check Internet Connection!" IDS_UNABLE_TO_REMOVE "Не удалось удалить данные о программе из реестра!" IDS_CERT_DOES_NOT_MATCH "Ошибка проверки SSL сертификата." IDS_INTEG_CHECK_TITLE "Проверка целостности приложения..." diff --git a/reactos/base/applications/rapps_new/lang/sk-SK.rc b/reactos/base/applications/rapps_new/lang/sk-SK.rc index 01ebd2bb49f..75d266815cc 100644 --- a/reactos/base/applications/rapps_new/lang/sk-SK.rc +++ b/reactos/base/applications/rapps_new/lang/sk-SK.rc @@ -202,6 +202,7 @@ BEGIN IDS_APP_REG_REMOVE "Naozaj chcete vymazaÅ¥ údaje o nainÅ¡talovanom programe z registrov?" IDS_INFORMATION "Informácie" IDS_UNABLE_TO_DOWNLOAD "Unable to download the package! Address not found!" + IDS_UNABLE_TO_DOWNLOAD2 "Unable to download the package! Check Internet Connection!" IDS_UNABLE_TO_REMOVE "Nie je možné odstrániÅ¥ z registrov údaje o programe!" IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed." IDS_INTEG_CHECK_TITLE "Verifying package integrity..." diff --git a/reactos/base/applications/rapps_new/lang/sq-AL.rc b/reactos/base/applications/rapps_new/lang/sq-AL.rc index b671e94d306..48f0d1ed7f3 100644 --- a/reactos/base/applications/rapps_new/lang/sq-AL.rc +++ b/reactos/base/applications/rapps_new/lang/sq-AL.rc @@ -201,6 +201,7 @@ BEGIN IDS_APP_REG_REMOVE "Jeni te sigurt qe do ti fshini informacionet e programit te instaluar nga regjistri?" IDS_INFORMATION "Informacione" IDS_UNABLE_TO_DOWNLOAD "Unable to download the package! Address not found!" + IDS_UNABLE_TO_DOWNLOAD2 "Unable to download the package! Check Internet Connection!" IDS_UNABLE_TO_REMOVE "E pamundur te fshihen informacionet e programit nga regjistri!" IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed." IDS_INTEG_CHECK_TITLE "Verifying package integrity..." diff --git a/reactos/base/applications/rapps_new/lang/sv-SE.rc b/reactos/base/applications/rapps_new/lang/sv-SE.rc index 9a1d392287f..838e1cd86a8 100644 --- a/reactos/base/applications/rapps_new/lang/sv-SE.rc +++ b/reactos/base/applications/rapps_new/lang/sv-SE.rc @@ -204,6 +204,7 @@ BEGIN IDS_APP_REG_REMOVE "Är du säker pÃ¥ att du vill ta bort data det installerade programmets data frÃ¥n registret?" IDS_INFORMATION "Information" IDS_UNABLE_TO_DOWNLOAD "Unable to download the package! Address not found!" + IDS_UNABLE_TO_DOWNLOAD2 "Unable to download the package! Check Internet Connection!" IDS_UNABLE_TO_REMOVE "Det gick ej att ta bort programmets data frÃ¥n registret!" IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed." IDS_INTEG_CHECK_TITLE "Verifying package integrity..." diff --git a/reactos/base/applications/rapps_new/lang/tr-TR.rc b/reactos/base/applications/rapps_new/lang/tr-TR.rc index af2d191bd43..34f2cf5fa77 100644 --- a/reactos/base/applications/rapps_new/lang/tr-TR.rc +++ b/reactos/base/applications/rapps_new/lang/tr-TR.rc @@ -199,6 +199,7 @@ BEGIN IDS_APP_REG_REMOVE "Kurulan izlencenin girişini değer defterinden silmek istediğinizden emin misiniz?" IDS_INFORMATION "Bilgi" IDS_UNABLE_TO_DOWNLOAD "Paket indirilemez! Adres bulunamadı!" + IDS_UNABLE_TO_DOWNLOAD2 "Unable to download the package! Check Internet Connection!" IDS_UNABLE_TO_REMOVE "Ä°zlencenin girişi değer defterinden silinemiyor." 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..." diff --git a/reactos/base/applications/rapps_new/lang/uk-UA.rc b/reactos/base/applications/rapps_new/lang/uk-UA.rc index 79eb3052f9b..9288b8729fb 100644 --- a/reactos/base/applications/rapps_new/lang/uk-UA.rc +++ b/reactos/base/applications/rapps_new/lang/uk-UA.rc @@ -205,6 +205,7 @@ BEGIN IDS_APP_REG_REMOVE "Ви дійсно хочете видалити дані про встановлену програму з реєстру?" IDS_INFORMATION "Інформація" IDS_UNABLE_TO_DOWNLOAD "Unable to download the package! Address not found!" + IDS_UNABLE_TO_DOWNLOAD2 "Unable to download the package! Check Internet Connection!" IDS_UNABLE_TO_REMOVE "Не вдалося видалити дані про програму з реєстру!" IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed." IDS_INTEG_CHECK_TITLE "Verifying package integrity..." diff --git a/reactos/base/applications/rapps_new/lang/zh-CN.rc b/reactos/base/applications/rapps_new/lang/zh-CN.rc index fdf5c5cc665..f5ba9d245e3 100644 --- a/reactos/base/applications/rapps_new/lang/zh-CN.rc +++ b/reactos/base/applications/rapps_new/lang/zh-CN.rc @@ -199,6 +199,7 @@ BEGIN IDS_APP_REG_REMOVE "您确定要从注册表删除该程序的数据吗?" IDS_INFORMATION "信息" IDS_UNABLE_TO_DOWNLOAD "无法下载该软件包 !找不到网络的地址 !" + IDS_UNABLE_TO_DOWNLOAD2 "Unable to download the package! Check Internet Connection!" IDS_UNABLE_TO_REMOVE "无法从注册表删除该程序的数据!" IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed." IDS_INTEG_CHECK_TITLE "Verifying package integrity..." diff --git a/reactos/base/applications/rapps_new/lang/zh-TW.rc b/reactos/base/applications/rapps_new/lang/zh-TW.rc index a7f767d7ede..56b0b9c7aa1 100644 --- a/reactos/base/applications/rapps_new/lang/zh-TW.rc +++ b/reactos/base/applications/rapps_new/lang/zh-TW.rc @@ -199,6 +199,7 @@ BEGIN IDS_APP_REG_REMOVE "您確定要從登錄檔刪除該程式的資料嗎?" IDS_INFORMATION "資訊" IDS_UNABLE_TO_DOWNLOAD "無法下載包!找不到的位址!" + IDS_UNABLE_TO_DOWNLOAD2 "Unable to download the package! Check Internet Connection!" IDS_UNABLE_TO_REMOVE "無法從登錄檔刪除該程式的資料!" IDS_CERT_DOES_NOT_MATCH "SSL 憑證驗證失敗。" IDS_INTEG_CHECK_TITLE "驗證套裝軟體的完整性..." diff --git a/reactos/base/applications/rapps_new/loaddlg.cpp b/reactos/base/applications/rapps_new/loaddlg.cpp index 46a2dca454d..9d6982f6788 100644 --- a/reactos/base/applications/rapps_new/loaddlg.cpp +++ b/reactos/base/applications/rapps_new/loaddlg.cpp @@ -348,7 +348,15 @@ ThreadFunc(LPVOID Context) hFile = InternetOpenUrlW(hOpen, AppInfo->szUrlDownload, NULL, 0, INTERNET_FLAG_PRAGMA_NOCACHE|INTERNET_FLAG_KEEP_CONNECTION, 0); if (!hFile) + { + WCHAR szMsgText[MAX_STR_LEN]; + + if (!LoadStringW(hInst, IDS_UNABLE_TO_DOWNLOAD2, szMsgText, sizeof(szMsgText) / sizeof(WCHAR))) + goto end; + + MessageBoxW(hMainWnd, szMsgText, NULL, MB_OK | MB_ICONERROR); goto end; + } if (!HttpQueryInfoW(hFile, HTTP_QUERY_STATUS_CODE | HTTP_QUERY_FLAG_NUMBER, &dwStatus, &dwStatusLen, NULL)) goto end; diff --git a/reactos/base/applications/rapps_new/resource.h b/reactos/base/applications/rapps_new/resource.h index 71d9423127e..07b1567cd2e 100644 --- a/reactos/base/applications/rapps_new/resource.h +++ b/reactos/base/applications/rapps_new/resource.h @@ -97,11 +97,12 @@ #define IDS_INFORMATION 117 #define IDS_UNABLE_TO_REMOVE 118 #define IDS_UNABLE_TO_DOWNLOAD 119 -#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 +#define IDS_UNABLE_TO_DOWNLOAD2 120 +#define IDS_CERT_DOES_NOT_MATCH 121 +#define IDS_INTEG_CHECK_TITLE 122 +#define IDS_INTEG_CHECK_FAIL 123 +#define IDS_INTERRUPTED_DOWNLOAD 124 +#define IDS_UNABLE_TO_WRITE 125 /* Tooltips */ #define IDS_TOOLTIP_INSTALL 200