From: Hannu Nyman Date: Tue, 12 Jan 2021 17:01:05 +0000 (+0200) Subject: luci-base: correct button name on flash page help text X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=efe43b81770f4cb3d1fa2f88614c271b5e3aeb4f;p=project%2Fluci.git luci-base: correct button name on flash page help text Correct the help text in the flash page to match the current buttons. 'Continue' instead of "Proceed". Adjust translations. Signed-off-by: Hannu Nyman (cherry picked from commit e2ac2e92b0de9f4be78b090ad7fc62a8df222b37 languages not existing in 19.07 removed from the commit) --- diff --git a/modules/luci-base/po/bg/base.po b/modules/luci-base/po/bg/base.po index 25a9a2fbe9..4130209796 100644 --- a/modules/luci-base/po/bg/base.po +++ b/modules/luci-base/po/bg/base.po @@ -5147,7 +5147,7 @@ msgstr "" msgid "" "The flash image was uploaded. Below is the checksum and file size listed, " "compare them with the original file to ensure data integrity.
Click " -"\"Proceed\" below to start the flash procedure." +"'Continue' below to start the flash procedure." msgstr "" #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/routes.js:195 diff --git a/modules/luci-base/po/ca/base.po b/modules/luci-base/po/ca/base.po index d65d932300..23e2d1e516 100644 --- a/modules/luci-base/po/ca/base.po +++ b/modules/luci-base/po/ca/base.po @@ -5222,7 +5222,7 @@ msgstr "" msgid "" "The flash image was uploaded. Below is the checksum and file size listed, " "compare them with the original file to ensure data integrity.
Click " -"\"Proceed\" below to start the flash procedure." +"'Continue' below to start the flash procedure." msgstr "" #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/routes.js:195 diff --git a/modules/luci-base/po/cs/base.po b/modules/luci-base/po/cs/base.po index db621f2341..f5283f217b 100644 --- a/modules/luci-base/po/cs/base.po +++ b/modules/luci-base/po/cs/base.po @@ -5371,7 +5371,7 @@ msgstr "" msgid "" "The flash image was uploaded. Below is the checksum and file size listed, " "compare them with the original file to ensure data integrity.
Click " -"\"Proceed\" below to start the flash procedure." +"'Continue' below to start the flash procedure." msgstr "" "Obraz s firmware byl nahrán. Níže je uveden kontrolní součet a velikost " "souboru. Porovnejte je s originálním souborem pro zajištění integrity dat. " diff --git a/modules/luci-base/po/de/base.po b/modules/luci-base/po/de/base.po index 96acedf62e..098f441046 100644 --- a/modules/luci-base/po/de/base.po +++ b/modules/luci-base/po/de/base.po @@ -5420,7 +5420,7 @@ msgstr "" msgid "" "The flash image was uploaded. Below is the checksum and file size listed, " "compare them with the original file to ensure data integrity.
Click " -"\"Proceed\" below to start the flash procedure." +"'Continue' below to start the flash procedure." msgstr "" "Das Firmware-Image wurde hochgeladen. Die aufgeführte Prüfsumme und " "Dateigröße mit der ursprünglichen Datei vergleichen um die Datenintegrität " diff --git a/modules/luci-base/po/el/base.po b/modules/luci-base/po/el/base.po index b42e1a9dfd..8ea88caf1f 100644 --- a/modules/luci-base/po/el/base.po +++ b/modules/luci-base/po/el/base.po @@ -5240,7 +5240,7 @@ msgstr "" msgid "" "The flash image was uploaded. Below is the checksum and file size listed, " "compare them with the original file to ensure data integrity.
Click " -"\"Proceed\" below to start the flash procedure." +"'Continue' below to start the flash procedure." msgstr "" #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/routes.js:195 diff --git a/modules/luci-base/po/en/base.po b/modules/luci-base/po/en/base.po index 385b617c58..a50d70bf3e 100644 --- a/modules/luci-base/po/en/base.po +++ b/modules/luci-base/po/en/base.po @@ -5205,7 +5205,7 @@ msgstr "" msgid "" "The flash image was uploaded. Below is the checksum and file size listed, " "compare them with the original file to ensure data integrity.
Click " -"\"Proceed\" below to start the flash procedure." +"'Continue' below to start the flash procedure." msgstr "" #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/routes.js:195 diff --git a/modules/luci-base/po/es/base.po b/modules/luci-base/po/es/base.po index 7f1098069d..bb36bbdd6d 100644 --- a/modules/luci-base/po/es/base.po +++ b/modules/luci-base/po/es/base.po @@ -5404,7 +5404,7 @@ msgstr "" msgid "" "The flash image was uploaded. Below is the checksum and file size listed, " "compare them with the original file to ensure data integrity.
Click " -"\"Proceed\" below to start the flash procedure." +"'Continue' below to start the flash procedure." msgstr "" "Se ha subido la imagen a grabar. A continuación se muestra la suma de " "comprobación y el tamaño del archivo, compárelos con el archivo original " diff --git a/modules/luci-base/po/fr/base.po b/modules/luci-base/po/fr/base.po index e467f87f4e..b8231c8c34 100644 --- a/modules/luci-base/po/fr/base.po +++ b/modules/luci-base/po/fr/base.po @@ -5427,7 +5427,7 @@ msgstr "" msgid "" "The flash image was uploaded. Below is the checksum and file size listed, " "compare them with the original file to ensure data integrity.
Click " -"\"Proceed\" below to start the flash procedure." +"'Continue' below to start the flash procedure." msgstr "" "L'image flash a été téléchargée. Vous trouverez ci-dessous la somme de " "contrôle et la taille du fichier, comparez-les avec le fichier d'origine " diff --git a/modules/luci-base/po/he/base.po b/modules/luci-base/po/he/base.po index 05b24031cf..ca9057f420 100644 --- a/modules/luci-base/po/he/base.po +++ b/modules/luci-base/po/he/base.po @@ -5179,7 +5179,7 @@ msgstr "" msgid "" "The flash image was uploaded. Below is the checksum and file size listed, " "compare them with the original file to ensure data integrity.
Click " -"\"Proceed\" below to start the flash procedure." +"'Continue' below to start the flash procedure." msgstr "" #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/routes.js:195 diff --git a/modules/luci-base/po/hi/base.po b/modules/luci-base/po/hi/base.po index 1e4b260daa..2883c10a35 100644 --- a/modules/luci-base/po/hi/base.po +++ b/modules/luci-base/po/hi/base.po @@ -5149,7 +5149,7 @@ msgstr "" msgid "" "The flash image was uploaded. Below is the checksum and file size listed, " "compare them with the original file to ensure data integrity.
Click " -"\"Proceed\" below to start the flash procedure." +"'Continue' below to start the flash procedure." msgstr "" #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/routes.js:195 diff --git a/modules/luci-base/po/hu/base.po b/modules/luci-base/po/hu/base.po index 69a1f16eb9..becbca54e7 100644 --- a/modules/luci-base/po/hu/base.po +++ b/modules/luci-base/po/hu/base.po @@ -5409,7 +5409,7 @@ msgstr "" msgid "" "The flash image was uploaded. Below is the checksum and file size listed, " "compare them with the original file to ensure data integrity.
Click " -"\"Proceed\" below to start the flash procedure." +"'Continue' below to start the flash procedure." msgstr "" "A telepítő lemezkép fel lett töltve. Alább található az ellenőrző-összeg és " "a fájlméret. Hasonlítsa össze az eredeti fájllal, hogy megbizonyosodjon az " diff --git a/modules/luci-base/po/it/base.po b/modules/luci-base/po/it/base.po index 1db22ad777..458ab9cbc4 100644 --- a/modules/luci-base/po/it/base.po +++ b/modules/luci-base/po/it/base.po @@ -5258,7 +5258,7 @@ msgstr "" msgid "" "The flash image was uploaded. Below is the checksum and file size listed, " "compare them with the original file to ensure data integrity.
Click " -"\"Proceed\" below to start the flash procedure." +"'Continue' below to start the flash procedure." msgstr "" #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/routes.js:195 diff --git a/modules/luci-base/po/ja/base.po b/modules/luci-base/po/ja/base.po index bb9517749c..6ee3057774 100644 --- a/modules/luci-base/po/ja/base.po +++ b/modules/luci-base/po/ja/base.po @@ -5362,7 +5362,7 @@ msgstr "LuCIが正常に機能するには、既存の無線設定を変更す msgid "" "The flash image was uploaded. Below is the checksum and file size listed, " "compare them with the original file to ensure data integrity.
Click " -"\"Proceed\" below to start the flash procedure." +"'Continue' below to start the flash procedure." msgstr "" "イメージファイルがアップロードされました。以下はそのチェックサムとファイルサ" "イズです。オリジナルのファイルと比較し、データの整合性を確認してください。" diff --git a/modules/luci-base/po/ko/base.po b/modules/luci-base/po/ko/base.po index d6acb381b9..75382e8e5a 100644 --- a/modules/luci-base/po/ko/base.po +++ b/modules/luci-base/po/ko/base.po @@ -5217,7 +5217,7 @@ msgstr "LuCI가 제대로 작동하려면 기존 무선 구성이 변경되어 msgid "" "The flash image was uploaded. Below is the checksum and file size listed, " "compare them with the original file to ensure data integrity.
Click " -"\"Proceed\" below to start the flash procedure." +"'Continue' below to start the flash procedure." msgstr "" "플래시 이미지가 업로드 되었습니다. 아래는 체크섬과 파일 크기 목록입니다. 원" "본 파일과 비교하여 데이터 무결성을 검증하세요.
아래 \"진행하기\"를 눌러 " diff --git a/modules/luci-base/po/mr/base.po b/modules/luci-base/po/mr/base.po index ff96987237..3867b836be 100644 --- a/modules/luci-base/po/mr/base.po +++ b/modules/luci-base/po/mr/base.po @@ -5147,7 +5147,7 @@ msgstr "" msgid "" "The flash image was uploaded. Below is the checksum and file size listed, " "compare them with the original file to ensure data integrity.
Click " -"\"Proceed\" below to start the flash procedure." +"'Continue' below to start the flash procedure." msgstr "" #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/routes.js:195 diff --git a/modules/luci-base/po/ms/base.po b/modules/luci-base/po/ms/base.po index 3c95c1aaf1..6707e76314 100644 --- a/modules/luci-base/po/ms/base.po +++ b/modules/luci-base/po/ms/base.po @@ -5176,7 +5176,7 @@ msgstr "" msgid "" "The flash image was uploaded. Below is the checksum and file size listed, " "compare them with the original file to ensure data integrity.
Click " -"\"Proceed\" below to start the flash procedure." +"'Continue' below to start the flash procedure." msgstr "" #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/routes.js:195 diff --git a/modules/luci-base/po/nb_NO/base.po b/modules/luci-base/po/nb_NO/base.po index fd026ddf4c..b5f0bdea4f 100644 --- a/modules/luci-base/po/nb_NO/base.po +++ b/modules/luci-base/po/nb_NO/base.po @@ -5238,7 +5238,7 @@ msgstr "" msgid "" "The flash image was uploaded. Below is the checksum and file size listed, " "compare them with the original file to ensure data integrity.
Click " -"\"Proceed\" below to start the flash procedure." +"'Continue' below to start the flash procedure." msgstr "" #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/routes.js:195 diff --git a/modules/luci-base/po/pl/base.po b/modules/luci-base/po/pl/base.po index 8daee28a78..d9ad4e7500 100644 --- a/modules/luci-base/po/pl/base.po +++ b/modules/luci-base/po/pl/base.po @@ -5383,7 +5383,7 @@ msgstr "" msgid "" "The flash image was uploaded. Below is the checksum and file size listed, " "compare them with the original file to ensure data integrity.
Click " -"\"Proceed\" below to start the flash procedure." +"'Continue' below to start the flash procedure." msgstr "" "Obraz został załadowany. Poniżej podano sumę kontrolną i rozmiar pliku, " "Porównaj je z oryginalnym plikiem, aby zapewnić integralność danych.
" diff --git a/modules/luci-base/po/pt/base.po b/modules/luci-base/po/pt/base.po index 5cbe781519..ecfb844b94 100644 --- a/modules/luci-base/po/pt/base.po +++ b/modules/luci-base/po/pt/base.po @@ -5427,11 +5427,11 @@ msgstr "" msgid "" "The flash image was uploaded. Below is the checksum and file size listed, " "compare them with the original file to ensure data integrity.
Click " -"\"Proceed\" below to start the flash procedure." +"'Continue' below to start the flash procedure." msgstr "" "A imagem flash foi enviada. Abaixo está a soma de verificação e o tamanho do " "ficheiro listado, compare-os com o ficheiro original para garantir a " -"integridade dos dados.
Clique em \"Continuar\" abaixo para iniciar o " +"integridade dos dados.
Clique em 'Continuar' abaixo para iniciar o " "procedimento flash." #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/routes.js:195 diff --git a/modules/luci-base/po/pt_BR/base.po b/modules/luci-base/po/pt_BR/base.po index f511670d03..e970ab4a2f 100644 --- a/modules/luci-base/po/pt_BR/base.po +++ b/modules/luci-base/po/pt_BR/base.po @@ -5466,11 +5466,11 @@ msgstr "" msgid "" "The flash image was uploaded. Below is the checksum and file size listed, " "compare them with the original file to ensure data integrity.
Click " -"\"Proceed\" below to start the flash procedure." +"'Continue' below to start the flash procedure." msgstr "" "A imagem flash foi carregada. Abaixo está a lista com o checksum e o tamanho " "do arquivo listados, compare-os com o arquivo original para garantir a " -"integridade dos dados.
Clique em \"Continuar\" para iniciar o " +"integridade dos dados.
Clique em 'Continuar' para iniciar o " "procedimento de atualização." #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/routes.js:195 diff --git a/modules/luci-base/po/ro/base.po b/modules/luci-base/po/ro/base.po index b7f6832a69..9e590a3ef4 100644 --- a/modules/luci-base/po/ro/base.po +++ b/modules/luci-base/po/ro/base.po @@ -5183,7 +5183,7 @@ msgstr "" msgid "" "The flash image was uploaded. Below is the checksum and file size listed, " "compare them with the original file to ensure data integrity.
Click " -"\"Proceed\" below to start the flash procedure." +"'Continue' below to start the flash procedure." msgstr "" #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/routes.js:195 diff --git a/modules/luci-base/po/ru/base.po b/modules/luci-base/po/ru/base.po index 039e112f0f..323180d3ae 100644 --- a/modules/luci-base/po/ru/base.po +++ b/modules/luci-base/po/ru/base.po @@ -5398,7 +5398,7 @@ msgstr "" msgid "" "The flash image was uploaded. Below is the checksum and file size listed, " "compare them with the original file to ensure data integrity.
Click " -"\"Proceed\" below to start the flash procedure." +"'Continue' below to start the flash procedure." msgstr "" "Образ прошивки загружен. Ниже приведены контрольная сумма и размер файла, " "сравните их с оригинальным файлом для обеспечения целостности данных.
Click " -"\"Proceed\" below to start the flash procedure." +"'Continue' below to start the flash procedure." msgstr "" "Obraz pamäte flash bol odovzdaný. Nižšie je kontrolný medzisúčet a veľkosť " "súboru. Porovnajte ich s originálnym súborom, kvôli istote integrity údajov. " diff --git a/modules/luci-base/po/sv/base.po b/modules/luci-base/po/sv/base.po index 6c95e0bf13..d1168efa41 100644 --- a/modules/luci-base/po/sv/base.po +++ b/modules/luci-base/po/sv/base.po @@ -5172,7 +5172,7 @@ msgstr "" msgid "" "The flash image was uploaded. Below is the checksum and file size listed, " "compare them with the original file to ensure data integrity.
Click " -"\"Proceed\" below to start the flash procedure." +"'Continue' below to start the flash procedure." msgstr "" #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/routes.js:195 diff --git a/modules/luci-base/po/templates/base.pot b/modules/luci-base/po/templates/base.pot index df592da6f8..cf9725d9a6 100644 --- a/modules/luci-base/po/templates/base.pot +++ b/modules/luci-base/po/templates/base.pot @@ -5138,7 +5138,7 @@ msgstr "" msgid "" "The flash image was uploaded. Below is the checksum and file size listed, " "compare them with the original file to ensure data integrity.
Click " -"\"Proceed\" below to start the flash procedure." +"'Continue' below to start the flash procedure." msgstr "" #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/routes.js:195 diff --git a/modules/luci-base/po/tr/base.po b/modules/luci-base/po/tr/base.po index 06dba0e316..4cb61929c0 100644 --- a/modules/luci-base/po/tr/base.po +++ b/modules/luci-base/po/tr/base.po @@ -5192,7 +5192,7 @@ msgstr "" msgid "" "The flash image was uploaded. Below is the checksum and file size listed, " "compare them with the original file to ensure data integrity.
Click " -"\"Proceed\" below to start the flash procedure." +"'Continue' below to start the flash procedure." msgstr "" #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/routes.js:195 diff --git a/modules/luci-base/po/uk/base.po b/modules/luci-base/po/uk/base.po index 68c69089f1..22c619db32 100644 --- a/modules/luci-base/po/uk/base.po +++ b/modules/luci-base/po/uk/base.po @@ -5431,11 +5431,11 @@ msgstr "" msgid "" "The flash image was uploaded. Below is the checksum and file size listed, " "compare them with the original file to ensure data integrity.
Click " -"\"Proceed\" below to start the flash procedure." +"'Continue' below to start the flash procedure." msgstr "" "Образ відвантажено. Нижче наведено контрольну суму та розмір файлу. " "Порівняйте їх з вихідним файлом, щоб переконатися в цілісності даних.
" -"Натисніть \"Продовжити\", щоб розпочати процедуру прошивання." +"Натисніть 'Продовжити', щоб розпочати процедуру прошивання." #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/routes.js:195 msgid "The following rules are currently active on this system." diff --git a/modules/luci-base/po/vi/base.po b/modules/luci-base/po/vi/base.po index 8080c5e33b..f53673f2a6 100644 --- a/modules/luci-base/po/vi/base.po +++ b/modules/luci-base/po/vi/base.po @@ -5334,11 +5334,11 @@ msgstr "" msgid "" "The flash image was uploaded. Below is the checksum and file size listed, " "compare them with the original file to ensure data integrity.
Click " -"\"Proceed\" below to start the flash procedure." +"'Continue' below to start the flash procedure." msgstr "" "Ảnh phần mềm đã được tải lên. Dưới đây là tổng kiểm tra và kích thước tệp " "được liệt kê, so sánh chúng với tệp gốc để đảm bảo tính toàn vẹn dữ liệu. " -"
Nhấp vào \" Tiếp tục \"bên dưới để bắt đầu quy trình flash." +"
Nhấp vào ' Tiếp tục ' bên dưới để bắt đầu quy trình flash." #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/routes.js:195 msgid "The following rules are currently active on this system." diff --git a/modules/luci-base/po/zh_Hans/base.po b/modules/luci-base/po/zh_Hans/base.po index f44aef12dd..62057224dd 100644 --- a/modules/luci-base/po/zh_Hans/base.po +++ b/modules/luci-base/po/zh_Hans/base.po @@ -5239,7 +5239,7 @@ msgstr "为了使 LuCI 正常运行，需要更改现有的无线配置。" msgid "" "The flash image was uploaded. Below is the checksum and file size listed, " "compare them with the original file to ensure data integrity.
Click " -"\"Proceed\" below to start the flash procedure." +"'Continue' below to start the flash procedure." msgstr "" "刷写镜像已上传。下面是列出的校验和及文件大小，将它们与原始文件进行比较以确保" "数据完整性。
单击下面的“继续”开始刷写。" diff --git a/modules/luci-base/po/zh_Hant/base.po b/modules/luci-base/po/zh_Hant/base.po index fe28d53786..c8f722fd40 100644 --- a/modules/luci-base/po/zh_Hant/base.po +++ b/modules/luci-base/po/zh_Hant/base.po @@ -5242,7 +5242,7 @@ msgstr "現有的無線網路設定需要修改，否則 LuCI 會出問題。" msgid "" "The flash image was uploaded. Below is the checksum and file size listed, " "compare them with the original file to ensure data integrity.
Click " -"\"Proceed\" below to start the flash procedure." +"'Continue' below to start the flash procedure." msgstr "" "映像檔已上傳。下方是效驗碼和大小，請與原始檔比較確認無誤。
按下方「執" "行」開始燒錄程序。" diff --git a/modules/luci-mod-system/htdocs/luci-static/resources/view/system/flash.js b/modules/luci-mod-system/htdocs/luci-static/resources/view/system/flash.js index 5eb905a2e4..db40a88ec6 100644 --- a/modules/luci-mod-system/htdocs/luci-static/resources/view/system/flash.js +++ b/modules/luci-mod-system/htdocs/luci-static/resources/view/system/flash.js @@ -210,7 +210,7 @@ return view.extend({ is_too_big = (storage_size > 0 && res[0].size > storage_size), body = []; - body.push(E('p', _('The flash image was uploaded. Below is the checksum and file size listed, compare them with the original file to ensure data integrity.
Click "Proceed" below to start the flash procedure.'))); + body.push(E('p', _("The flash image was uploaded. Below is the checksum and file size listed, compare them with the original file to ensure data integrity.
Click 'Continue' below to start the flash procedure."))); body.push(E('ul', {}, [ res[0].size ? E('li', {}, '%s: %1024.2mB'.format(_('Size'), res[0].size)) : '', res[0].checksum ? E('li', {}, '%s: %s'.format(_('MD5'), res[0].checksum)) : '',