From 16f98c7e1e13495257258483c61cd2fdc4bc87e1 Mon Sep 17 00:00:00 2001 From: Ing Date: Wed, 6 Mar 2024 02:02:25 +0800 Subject: [PATCH] modify update --- files/initrd/opt/rr/lang/ko_KR.po | 225 ++++++-------- files/initrd/opt/rr/lang/rr.pot | 206 ++++++------- files/initrd/opt/rr/lang/ru_RU.po | 226 ++++++-------- files/initrd/opt/rr/lang/zh_CN.po | 228 ++++++--------- files/initrd/opt/rr/lang/zh_HK.po | 225 ++++++-------- files/initrd/opt/rr/lang/zh_TW.po | 472 +++++++++++++++++------------- files/initrd/opt/rr/menu.sh | 425 +++++++++++++++++---------- scripts/func.sh | 39 ++- 8 files changed, 1033 insertions(+), 1013 deletions(-) diff --git a/files/initrd/opt/rr/lang/ko_KR.po b/files/initrd/opt/rr/lang/ko_KR.po index 9812a14d..c5c93ab9 100644 --- a/files/initrd/opt/rr/lang/ko_KR.po +++ b/files/initrd/opt/rr/lang/ko_KR.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: RR\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-03-03 02:12+0800\n" -"PO-Revision-Date: 2024-03-03 02:23+0800\n" +"POT-Creation-Date: 2024-03-06 01:44+0800\n" +"PO-Revision-Date: 2024-03-06 01:57+0800\n" "Last-Translator: EXP \n" "Language-Team: 한국인 (대한민국) \n" "Language: ko_KR\n" @@ -323,8 +323,10 @@ msgstr "" "DUFS를 통해 /mnt/p3/users/ 폴더에 Pat 파일을 업로드한 후 이 옵션을 다시 입력" "하세요.\\n" -#: menu.sh:350 menu.sh:360 menu.sh:2474 menu.sh:2548 menu.sh:2559 menu.sh:2576 -#: menu.sh:2601 +#: menu.sh:350 menu.sh:360 menu.sh:2593 menu.sh:2594 menu.sh:2595 menu.sh:2596 +#: menu.sh:2597 menu.sh:2598 menu.sh:2604 menu.sh:2627 menu.sh:2638 +#: menu.sh:2649 menu.sh:2660 menu.sh:2674 menu.sh:2685 menu.sh:2702 +#: menu.sh:2721 msgid "Update" msgstr "업데이트" @@ -348,7 +350,7 @@ msgstr "현재 %s는 지원되지 않습니다." msgid "Currently, %s of %s is not supported." msgstr "현재 %s-%s는 지원되지 않습니다." -#: menu.sh:464 menu.sh:1252 menu.sh:2682 menu.sh:2700 +#: menu.sh:464 menu.sh:1252 menu.sh:2803 menu.sh:2821 msgid "Main menu" msgstr "메인 메뉴" @@ -362,11 +364,11 @@ msgstr "오류" #: menu.sh:500 menu.sh:517 menu.sh:522 menu.sh:528 menu.sh:539 menu.sh:547 #: menu.sh:570 menu.sh:577 menu.sh:581 menu.sh:595 menu.sh:599 menu.sh:607 -#: menu.sh:610 +#: menu.sh:610 menu.sh:2414 menu.sh:2444 menu.sh:2595 menu.sh:2628 menu.sh:2632 msgid "Addons" msgstr "애드온" -#: menu.sh:501 menu.sh:631 menu.sh:807 menu.sh:942 menu.sh:1273 menu.sh:2683 +#: menu.sh:501 menu.sh:631 menu.sh:807 menu.sh:942 menu.sh:1273 menu.sh:2804 msgid "Choose a option" msgstr "옵션 선택" @@ -387,7 +389,7 @@ msgid "Upload a external addon" msgstr "외부 애드온 업로드" #: menu.sh:506 menu.sh:638 menu.sh:805 menu.sh:940 menu.sh:1278 menu.sh:1410 -#: menu.sh:2472 menu.sh:2680 menu.sh:2775 +#: menu.sh:2601 menu.sh:2801 menu.sh:2896 msgid "Exit" msgstr "나가기" @@ -419,7 +421,7 @@ msgstr "" "이름 색상이 \"\\Z4파랑색\\Zn\"인 경우 추가됨, \"검은색\"인 경우 추가되지 않" "음.\\n\\n" -#: menu.sh:576 menu.sh:710 menu.sh:1286 menu.sh:2546 +#: menu.sh:576 menu.sh:710 menu.sh:1286 menu.sh:2672 msgid "" "This feature is only available when accessed via ssh (Requires a terminal " "that supports ZModem protocol).\\n" @@ -431,7 +433,7 @@ msgstr "" msgid "Please upload the *.addons file." msgstr "*.addons 파일을 업로드하세요." -#: menu.sh:596 menu.sh:745 menu.sh:2577 menu.sh:2602 +#: menu.sh:596 menu.sh:745 menu.sh:2703 menu.sh:2722 msgid "Not a valid file, please try again!" msgstr "파일이 올바르지 않습니다. 다시 시도하세요!" @@ -449,7 +451,8 @@ msgid "File format not recognized!" msgstr "파일 형식이 인식되지 않습니다!" #: menu.sh:630 menu.sh:644 menu.sh:657 menu.sh:694 menu.sh:711 menu.sh:721 -#: menu.sh:724 menu.sh:740 menu.sh:744 menu.sh:758 menu.sh:764 +#: menu.sh:724 menu.sh:740 menu.sh:744 menu.sh:758 menu.sh:764 menu.sh:2459 +#: menu.sh:2494 menu.sh:2596 menu.sh:2639 menu.sh:2643 msgid "Modules" msgstr "모듈" @@ -1270,7 +1273,7 @@ msgstr "알림" msgid "Config changed, would you like to rebuild the loader?" msgstr "구성이 변경되었습니다. 로더를 다시 빌드하시겠습니까?" -#: menu.sh:2194 menu.sh:2673 +#: menu.sh:2194 menu.sh:2794 msgid "Choose a language" msgstr "언어 선택" @@ -1282,49 +1285,52 @@ msgstr "레이아웃 선택" msgid "Choice a keymap" msgstr "키맵 선택" -#: menu.sh:2240 menu.sh:2311 menu.sh:2398 menu.sh:2484 menu.sh:2489 -#: menu.sh:2494 menu.sh:2499 menu.sh:2506 menu.sh:2514 menu.sh:2520 -#: menu.sh:2526 menu.sh:2532 menu.sh:2538 +#: menu.sh:2240 menu.sh:2317 menu.sh:2414 menu.sh:2459 menu.sh:2509 +#: menu.sh:2548 msgid "Update %s" msgstr "업데이트 %s" -#: menu.sh:2242 menu.sh:2245 +#: menu.sh:2241 msgid "Checking last version ..." msgstr "새 버전 확인 중..." -#: menu.sh:2256 menu.sh:2259 menu.sh:2262 menu.sh:2268 +#: menu.sh:2257 msgid "Error checking new version.\\nError: TAG is %s" msgstr "새 버전을 확인하는 동안 오류가 발생했습니다.\\n오류: 태그는 %s입니다." -#: menu.sh:2271 -msgid "No new version. Actual version is %s\\nForce update?" -msgstr "새 버전이 없습니다. 실제 버전은 %s\\n강제로 업데이트하시겠습니까?" - -#: menu.sh:2275 +#: menu.sh:2270 msgid "No new version." msgstr "새 버전이 없습니다." -#: menu.sh:2291 +#: menu.sh:2274 +msgid "Actual version is %s\\nForce update?" +msgstr "실제 버전은 %s\\n강제로 업데이트하시겠습니까?" + +#: menu.sh:2296 msgid "Downloading ..." msgstr "다운로드 중..." -#: menu.sh:2295 menu.sh:2298 menu.sh:2301 +#: menu.sh:2299 msgid "Error downloading new version.\\nError: %d:%d" msgstr "새 버전을 다운로드하는 동안 오류가 발생했습니다.\\n오류: %d:%d" -#: menu.sh:2313 menu.sh:2316 menu.sh:2400 menu.sh:2403 -msgid "Extracting last version" -msgstr "새 버전 추출 중" +#: menu.sh:2317 menu.sh:2401 menu.sh:2594 menu.sh:2621 +msgid "RR" +msgstr "RR" -#: menu.sh:2321 menu.sh:2324 -msgid "Error extracting update file" -msgstr "업데이트 파일 추출 중 오류 발생" +#: menu.sh:2318 menu.sh:2415 menu.sh:2460 menu.sh:2510 menu.sh:2549 +msgid "Extracting update file ..." +msgstr "업데이트 파일 추출 중 ..." -#: menu.sh:2332 menu.sh:2335 +#: menu.sh:2329 menu.sh:2426 menu.sh:2471 menu.sh:2521 menu.sh:2560 +msgid "Error extracting update file." +msgstr "업데이트 파일 추출 중 오류 발생." + +#: menu.sh:2341 msgid "Checksum do not match!" msgstr "체크섬이 일치하지 않습니다!" -#: menu.sh:2345 menu.sh:2348 +#: menu.sh:2355 msgid "" "The current version does not support upgrading to the latest update.zip. " "Please remake the bootloader disk!" @@ -1332,207 +1338,164 @@ msgstr "" "현재 버전은 최신 update.zip으로 업그레이드를 지원하지 않습니다. 부트로더 디스" "크를 다시 제작하세요!" -#: menu.sh:2354 menu.sh:2357 +#: menu.sh:2365 msgid "Installing new files ..." msgstr "새 파일 설치 중 ..." -#: menu.sh:2387 menu.sh:2390 -msgid "RR updated with success to %s!\\nReboot?" -msgstr "RR이 %s!로 업데이트되었습니다!\\n재부팅하시겠습니까?" - -#: menu.sh:2410 menu.sh:2413 -msgid "Installing new %s ..." -msgstr "새 %s 설치 중 ..." - -#: menu.sh:2445 menu.sh:2448 menu.sh:2451 +#: menu.sh:2401 menu.sh:2444 menu.sh:2494 menu.sh:2533 menu.sh:2572 msgid "%s updated with success!" msgstr "s가 성공적으로 업데이트되었습니다!" -#: menu.sh:2464 -msgid "Update all" -msgstr "모두 업데이트" +#: menu.sh:2401 +msgid "Reboot?" +msgstr "재부팅?" -#: menu.sh:2465 -msgid "Update RR" -msgstr "RR 업데이트" - -#: menu.sh:2466 -msgid "Update addons" -msgstr "애드온 업데이트" - -#: menu.sh:2467 -msgid "Update modules" -msgstr "모듈 업데이트" - -#: menu.sh:2468 -msgid "Update LKMs" -msgstr "LKM 업데이트" - -#: menu.sh:2469 -msgid "Update CKs" -msgstr "CK 업데이트" - -#: menu.sh:2470 -msgid "Local upload" -msgstr "로컬 업로드" - -#: menu.sh:2471 -msgid "Pre Release:" -msgstr "사전 릴리즈:" - -#: menu.sh:2475 -msgid "" -"Manually uploading update.zip,addons.zip,modules.zip,rp-lkms.zip,rr-cks.zip " -"to /tmp/ will skip the download." -msgstr "" -"update.zip, addons.zip, modules.zip, rp-lkms.zip, rr-cks.zip을 /tmp/에 수동으" -"로 업로드하면 다운로드가 건너뛰게 됩니다." - -#: menu.sh:2484 menu.sh:2520 -msgid "addons" -msgstr "애드온" - -#: menu.sh:2489 menu.sh:2526 -msgid "modules" -msgstr "모듈" - -#: menu.sh:2494 menu.sh:2532 +#: menu.sh:2509 menu.sh:2533 menu.sh:2597 menu.sh:2650 menu.sh:2654 msgid "LKMs" msgstr "LKMs" -#: menu.sh:2499 menu.sh:2538 +#: menu.sh:2548 menu.sh:2572 menu.sh:2598 menu.sh:2661 menu.sh:2665 msgid "CKs" msgstr "CKs" -#: menu.sh:2506 menu.sh:2514 -msgid "RR" -msgstr "RR" +#: menu.sh:2593 menu.sh:2615 +msgid "All" +msgstr "전부의" -#: menu.sh:2547 +#: menu.sh:2599 +msgid "Local upload" +msgstr "로컬 업로드" + +#: menu.sh:2600 +msgid "Pre Release:" +msgstr "사전 릴리즈:" + +#: menu.sh:2605 menu.sh:2673 msgid "" -"Or upload update.zip, addons.zip, modules.zip, rp-lkms.zip,rr-cks.zip to /" -"tmp/ via DUFS will skip the download.\\n" +"Manually uploading update*.zip,addons*.zip,modules*.zip,rp-lkms*.zip,rr-cks*." +"zip to /tmp/ will skip the download." msgstr "" -"DUFS를 통해 update.zip, addons.zip, modules.zip, rp-lkms.zip, rr-cks.zip을 /" -"tmp/에 업로드하면 다운로드가 생략됩니다.\\n" +"update.zip, addons*.zip, modules*.zip, rp-lkms*.zip, rr-cks*.zip을 /tmp/에 수" +"동으로 업로드하면 다운로드가 건너뛰게 됩니다." -#: menu.sh:2553 +#: menu.sh:2628 menu.sh:2639 menu.sh:2650 menu.sh:2661 +msgid "No longer supports update %s separately. Please choose to update All/RR" +msgstr "%s 단독 업데이트는 더 이상 지원되지 않습니다.모든 /RR 업데이트 선택" + +#: menu.sh:2679 msgid "" "Please keep the attachment name consistent with the attachment name on " "Github.\\n" msgstr "첨부 파일 이름은 Github의 첨부 파일 이름과 일치하도록 유지하세요.\\n" -#: menu.sh:2554 +#: menu.sh:2680 msgid "Upload update*.zip will update RR.\\n" msgstr "update*.zip을 업로드하면 RR이 업데이트됩니다.\\n" -#: menu.sh:2555 +#: menu.sh:2681 msgid "Upload addons*.zip will update Addons.\\n" msgstr "addons*.zip을 업로드하면 Addons 기능이 업데이트됩니다.\\n" -#: menu.sh:2556 +#: menu.sh:2682 msgid "Upload modules*.zip will update Modules.\\n" msgstr "modules*.zip을 업로드하면 Modules이 업데이트됩니다.\\n" -#: menu.sh:2557 +#: menu.sh:2683 msgid "Upload rp-lkms*.zip will update LKMs.\\n" msgstr "rp-lkms*.zip을 업로드하면 LKMs이 업데이트됩니다.\\n" -#: menu.sh:2558 +#: menu.sh:2684 msgid "Upload rr-cks*.zip will update CKs.\\n" msgstr "rr-cks*.zip을 업로드하면 CKs이 업데이트됩니다.\\n" -#: menu.sh:2619 +#: menu.sh:2740 msgid "This person is very lazy and hasn't written anything." msgstr "이 사람은 매우 게으르고 아무것도 쓰지 않았습니다." -#: menu.sh:2646 +#: menu.sh:2767 msgid "Choose a model" msgstr "모델 선택" -#: menu.sh:2648 +#: menu.sh:2769 msgid "Choose a version" msgstr "버전 선택" -#: menu.sh:2650 +#: menu.sh:2771 msgid "Parse pat" msgstr "Parse pat" -#: menu.sh:2657 +#: menu.sh:2778 msgid "Kernel:" msgstr "Kernel:" -#: menu.sh:2659 +#: menu.sh:2780 msgid "Addons menu" msgstr "애드온 설정" -#: menu.sh:2660 +#: menu.sh:2781 msgid "Modules menu" msgstr "모듈 설정" -#: menu.sh:2661 +#: menu.sh:2782 msgid "Cmdline menu" msgstr "명령줄 설정" -#: menu.sh:2662 +#: menu.sh:2783 msgid "Synoinfo menu" msgstr "synoinfo" -#: menu.sh:2664 +#: menu.sh:2785 msgid "Advanced menu" msgstr "고급 설정" -#: menu.sh:2667 +#: menu.sh:2788 msgid "Build the loader" msgstr "로더 빌드" -#: menu.sh:2671 +#: menu.sh:2792 msgid "Boot the loader" msgstr "로더 부팅" -#: menu.sh:2674 +#: menu.sh:2795 msgid "Choose a keymap" msgstr "키맵 선택" -#: menu.sh:2676 +#: menu.sh:2797 msgid "Clean disk cache" msgstr "디스크 캐시 지우기" -#: menu.sh:2678 +#: menu.sh:2799 msgid "Update menu" msgstr "업데이트" -#: menu.sh:2679 +#: menu.sh:2800 msgid "Notepad" msgstr "메모장" -#: menu.sh:2701 +#: menu.sh:2822 msgid "Change ..." msgstr "변화 ..." -#: menu.sh:2770 +#: menu.sh:2891 msgid "Choose a action" msgstr "작업 선택" -#: menu.sh:2771 +#: menu.sh:2892 msgid "Poweroff" msgstr "전원 끄기" -#: menu.sh:2772 +#: menu.sh:2893 msgid "Reboot" msgstr "재부팅" -#: menu.sh:2773 +#: menu.sh:2894 msgid "Reboot to RR" msgstr "RR로 재부팅" -#: menu.sh:2774 +#: menu.sh:2895 msgid "Back to shell" msgstr "Shell로 돌아가기" -#: menu.sh:2800 +#: menu.sh:2921 msgid "Call \\033[1;32mmenu.sh\\033[0m to return to menu" msgstr "\\033[1;32mmenu.sh\\033[0m 메뉴로 돌아가기" - -#~ msgid "Custom dts file # Need rebuild" -#~ msgstr "사용자 정의 dts 파일 # 재빌드 필요" diff --git a/files/initrd/opt/rr/lang/rr.pot b/files/initrd/opt/rr/lang/rr.pot index 7d7f5720..4fb21e42 100644 --- a/files/initrd/opt/rr/lang/rr.pot +++ b/files/initrd/opt/rr/lang/rr.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-03-03 02:12+0800\n" +"POT-Creation-Date: 2024-03-06 01:44+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -297,8 +297,10 @@ msgid "" "this option.\\n" msgstr "" -#: menu.sh:350 menu.sh:360 menu.sh:2474 menu.sh:2548 menu.sh:2559 menu.sh:2576 -#: menu.sh:2601 +#: menu.sh:350 menu.sh:360 menu.sh:2593 menu.sh:2594 menu.sh:2595 menu.sh:2596 +#: menu.sh:2597 menu.sh:2598 menu.sh:2604 menu.sh:2627 menu.sh:2638 +#: menu.sh:2649 menu.sh:2660 menu.sh:2674 menu.sh:2685 menu.sh:2702 +#: menu.sh:2721 msgid "Update" msgstr "" @@ -322,7 +324,7 @@ msgstr "" msgid "Currently, %s of %s is not supported." msgstr "" -#: menu.sh:464 menu.sh:1252 menu.sh:2682 menu.sh:2700 +#: menu.sh:464 menu.sh:1252 menu.sh:2803 menu.sh:2821 msgid "Main menu" msgstr "" @@ -336,11 +338,11 @@ msgstr "" #: menu.sh:500 menu.sh:517 menu.sh:522 menu.sh:528 menu.sh:539 menu.sh:547 #: menu.sh:570 menu.sh:577 menu.sh:581 menu.sh:595 menu.sh:599 menu.sh:607 -#: menu.sh:610 +#: menu.sh:610 menu.sh:2414 menu.sh:2444 menu.sh:2595 menu.sh:2628 menu.sh:2632 msgid "Addons" msgstr "" -#: menu.sh:501 menu.sh:631 menu.sh:807 menu.sh:942 menu.sh:1273 menu.sh:2683 +#: menu.sh:501 menu.sh:631 menu.sh:807 menu.sh:942 menu.sh:1273 menu.sh:2804 msgid "Choose a option" msgstr "" @@ -361,7 +363,7 @@ msgid "Upload a external addon" msgstr "" #: menu.sh:506 menu.sh:638 menu.sh:805 menu.sh:940 menu.sh:1278 menu.sh:1410 -#: menu.sh:2472 menu.sh:2680 menu.sh:2775 +#: menu.sh:2601 menu.sh:2801 menu.sh:2896 msgid "Exit" msgstr "" @@ -391,7 +393,7 @@ msgid "" "not added.\\n\\n" msgstr "" -#: menu.sh:576 menu.sh:710 menu.sh:1286 menu.sh:2546 +#: menu.sh:576 menu.sh:710 menu.sh:1286 menu.sh:2672 msgid "" "This feature is only available when accessed via ssh (Requires a terminal " "that supports ZModem protocol).\\n" @@ -401,7 +403,7 @@ msgstr "" msgid "Please upload the *.addons file." msgstr "" -#: menu.sh:596 menu.sh:745 menu.sh:2577 menu.sh:2602 +#: menu.sh:596 menu.sh:745 menu.sh:2703 menu.sh:2722 msgid "Not a valid file, please try again!" msgstr "" @@ -418,7 +420,8 @@ msgid "File format not recognized!" msgstr "" #: menu.sh:630 menu.sh:644 menu.sh:657 menu.sh:694 menu.sh:711 menu.sh:721 -#: menu.sh:724 menu.sh:740 menu.sh:744 menu.sh:758 menu.sh:764 +#: menu.sh:724 menu.sh:740 menu.sh:744 menu.sh:758 menu.sh:764 menu.sh:2459 +#: menu.sh:2494 menu.sh:2596 menu.sh:2639 menu.sh:2643 msgid "Modules" msgstr "" @@ -1192,7 +1195,7 @@ msgstr "" msgid "Config changed, would you like to rebuild the loader?" msgstr "" -#: menu.sh:2194 menu.sh:2673 +#: menu.sh:2194 menu.sh:2794 msgid "Choose a language" msgstr "" @@ -1204,248 +1207,213 @@ msgstr "" msgid "Choice a keymap" msgstr "" -#: menu.sh:2240 menu.sh:2311 menu.sh:2398 menu.sh:2484 menu.sh:2489 -#: menu.sh:2494 menu.sh:2499 menu.sh:2506 menu.sh:2514 menu.sh:2520 -#: menu.sh:2526 menu.sh:2532 menu.sh:2538 +#: menu.sh:2240 menu.sh:2317 menu.sh:2414 menu.sh:2459 menu.sh:2509 +#: menu.sh:2548 msgid "Update %s" msgstr "" -#: menu.sh:2242 menu.sh:2245 +#: menu.sh:2241 msgid "Checking last version ..." msgstr "" -#: menu.sh:2256 menu.sh:2259 menu.sh:2262 menu.sh:2268 +#: menu.sh:2257 msgid "Error checking new version.\\nError: TAG is %s" msgstr "" -#: menu.sh:2271 -msgid "No new version. Actual version is %s\\nForce update?" -msgstr "" - -#: menu.sh:2275 +#: menu.sh:2270 msgid "No new version." msgstr "" -#: menu.sh:2291 +#: menu.sh:2274 +msgid "Actual version is %s\\nForce update?" +msgstr "" + +#: menu.sh:2296 msgid "Downloading ..." msgstr "" -#: menu.sh:2295 menu.sh:2298 menu.sh:2301 +#: menu.sh:2299 msgid "Error downloading new version.\\nError: %d:%d" msgstr "" -#: menu.sh:2313 menu.sh:2316 menu.sh:2400 menu.sh:2403 -msgid "Extracting last version" +#: menu.sh:2317 menu.sh:2401 menu.sh:2594 menu.sh:2621 +msgid "RR" msgstr "" -#: menu.sh:2321 menu.sh:2324 -msgid "Error extracting update file" +#: menu.sh:2318 menu.sh:2415 menu.sh:2460 menu.sh:2510 menu.sh:2549 +msgid "Extracting update file ..." msgstr "" -#: menu.sh:2332 menu.sh:2335 +#: menu.sh:2329 menu.sh:2426 menu.sh:2471 menu.sh:2521 menu.sh:2560 +msgid "Error extracting update file." +msgstr "" + +#: menu.sh:2341 msgid "Checksum do not match!" msgstr "" -#: menu.sh:2345 menu.sh:2348 +#: menu.sh:2355 msgid "" "The current version does not support upgrading to the latest update.zip. " "Please remake the bootloader disk!" msgstr "" -#: menu.sh:2354 menu.sh:2357 +#: menu.sh:2365 msgid "Installing new files ..." msgstr "" -#: menu.sh:2387 menu.sh:2390 -msgid "RR updated with success to %s!\\nReboot?" -msgstr "" - -#: menu.sh:2410 menu.sh:2413 -msgid "Installing new %s ..." -msgstr "" - -#: menu.sh:2445 menu.sh:2448 menu.sh:2451 +#: menu.sh:2401 menu.sh:2444 menu.sh:2494 menu.sh:2533 menu.sh:2572 msgid "%s updated with success!" msgstr "" -#: menu.sh:2464 -msgid "Update all" +#: menu.sh:2401 +msgid "Reboot?" msgstr "" -#: menu.sh:2465 -msgid "Update RR" -msgstr "" - -#: menu.sh:2466 -msgid "Update addons" -msgstr "" - -#: menu.sh:2467 -msgid "Update modules" -msgstr "" - -#: menu.sh:2468 -msgid "Update LKMs" -msgstr "" - -#: menu.sh:2469 -msgid "Update CKs" -msgstr "" - -#: menu.sh:2470 -msgid "Local upload" -msgstr "" - -#: menu.sh:2471 -msgid "Pre Release:" -msgstr "" - -#: menu.sh:2475 -msgid "" -"Manually uploading update.zip,addons.zip,modules.zip,rp-lkms.zip,rr-cks.zip " -"to /tmp/ will skip the download." -msgstr "" - -#: menu.sh:2484 menu.sh:2520 -msgid "addons" -msgstr "" - -#: menu.sh:2489 menu.sh:2526 -msgid "modules" -msgstr "" - -#: menu.sh:2494 menu.sh:2532 +#: menu.sh:2509 menu.sh:2533 menu.sh:2597 menu.sh:2650 menu.sh:2654 msgid "LKMs" msgstr "" -#: menu.sh:2499 menu.sh:2538 +#: menu.sh:2548 menu.sh:2572 menu.sh:2598 menu.sh:2661 menu.sh:2665 msgid "CKs" msgstr "" -#: menu.sh:2506 menu.sh:2514 -msgid "RR" +#: menu.sh:2593 menu.sh:2615 +msgid "All" msgstr "" -#: menu.sh:2547 +#: menu.sh:2599 +msgid "Local upload" +msgstr "" + +#: menu.sh:2600 +msgid "Pre Release:" +msgstr "" + +#: menu.sh:2605 menu.sh:2673 msgid "" -"Or upload update.zip, addons.zip, modules.zip, rp-lkms.zip,rr-cks.zip to /" -"tmp/ via DUFS will skip the download.\\n" +"Manually uploading update*.zip,addons*.zip,modules*.zip,rp-lkms*.zip,rr-cks*." +"zip to /tmp/ will skip the download." msgstr "" -#: menu.sh:2553 +#: menu.sh:2628 menu.sh:2639 menu.sh:2650 menu.sh:2661 +msgid "No longer supports update %s separately. Please choose to update All/RR" +msgstr "" + +#: menu.sh:2679 msgid "" "Please keep the attachment name consistent with the attachment name on " "Github.\\n" msgstr "" -#: menu.sh:2554 +#: menu.sh:2680 msgid "Upload update*.zip will update RR.\\n" msgstr "" -#: menu.sh:2555 +#: menu.sh:2681 msgid "Upload addons*.zip will update Addons.\\n" msgstr "" -#: menu.sh:2556 +#: menu.sh:2682 msgid "Upload modules*.zip will update Modules.\\n" msgstr "" -#: menu.sh:2557 +#: menu.sh:2683 msgid "Upload rp-lkms*.zip will update LKMs.\\n" msgstr "" -#: menu.sh:2558 +#: menu.sh:2684 msgid "Upload rr-cks*.zip will update CKs.\\n" msgstr "" -#: menu.sh:2619 +#: menu.sh:2740 msgid "This person is very lazy and hasn't written anything." msgstr "" -#: menu.sh:2646 +#: menu.sh:2767 msgid "Choose a model" msgstr "" -#: menu.sh:2648 +#: menu.sh:2769 msgid "Choose a version" msgstr "" -#: menu.sh:2650 +#: menu.sh:2771 msgid "Parse pat" msgstr "" -#: menu.sh:2657 +#: menu.sh:2778 msgid "Kernel:" msgstr "" -#: menu.sh:2659 +#: menu.sh:2780 msgid "Addons menu" msgstr "" -#: menu.sh:2660 +#: menu.sh:2781 msgid "Modules menu" msgstr "" -#: menu.sh:2661 +#: menu.sh:2782 msgid "Cmdline menu" msgstr "" -#: menu.sh:2662 +#: menu.sh:2783 msgid "Synoinfo menu" msgstr "" -#: menu.sh:2664 +#: menu.sh:2785 msgid "Advanced menu" msgstr "" -#: menu.sh:2667 +#: menu.sh:2788 msgid "Build the loader" msgstr "" -#: menu.sh:2671 +#: menu.sh:2792 msgid "Boot the loader" msgstr "" -#: menu.sh:2674 +#: menu.sh:2795 msgid "Choose a keymap" msgstr "" -#: menu.sh:2676 +#: menu.sh:2797 msgid "Clean disk cache" msgstr "" -#: menu.sh:2678 +#: menu.sh:2799 msgid "Update menu" msgstr "" -#: menu.sh:2679 +#: menu.sh:2800 msgid "Notepad" msgstr "" -#: menu.sh:2701 +#: menu.sh:2822 msgid "Change ..." msgstr "" -#: menu.sh:2770 +#: menu.sh:2891 msgid "Choose a action" msgstr "" -#: menu.sh:2771 +#: menu.sh:2892 msgid "Poweroff" msgstr "" -#: menu.sh:2772 +#: menu.sh:2893 msgid "Reboot" msgstr "" -#: menu.sh:2773 +#: menu.sh:2894 msgid "Reboot to RR" msgstr "" -#: menu.sh:2774 +#: menu.sh:2895 msgid "Back to shell" msgstr "" -#: menu.sh:2800 +#: menu.sh:2921 msgid "Call \\033[1;32mmenu.sh\\033[0m to return to menu" msgstr "" diff --git a/files/initrd/opt/rr/lang/ru_RU.po b/files/initrd/opt/rr/lang/ru_RU.po index 2aa0da0a..63990e1f 100644 --- a/files/initrd/opt/rr/lang/ru_RU.po +++ b/files/initrd/opt/rr/lang/ru_RU.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: RR\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-03-03 02:12+0800\n" -"PO-Revision-Date: 2024-03-03 02:21+0800\n" +"POT-Creation-Date: 2024-03-06 01:44+0800\n" +"PO-Revision-Date: 2024-03-06 01:55+0800\n" "Last-Translator: Alex TG @xpenology_russian\n" "Language-Team: Русский перевод TG @xpenology_russian\n" "Language: ru_RU\n" @@ -324,8 +324,10 @@ msgstr "" "Пожалуйста, загрузите файл pat в папку /mnt/p3/users/ через DUFS и повторно " "введите эту опцию.\\n" -#: menu.sh:350 menu.sh:360 menu.sh:2474 menu.sh:2548 menu.sh:2559 menu.sh:2576 -#: menu.sh:2601 +#: menu.sh:350 menu.sh:360 menu.sh:2593 menu.sh:2594 menu.sh:2595 menu.sh:2596 +#: menu.sh:2597 menu.sh:2598 menu.sh:2604 menu.sh:2627 menu.sh:2638 +#: menu.sh:2649 menu.sh:2660 menu.sh:2674 menu.sh:2685 menu.sh:2702 +#: menu.sh:2721 msgid "Update" msgstr "Обновить" @@ -349,7 +351,7 @@ msgstr "В настоящее время %s не поддерживается." msgid "Currently, %s of %s is not supported." msgstr "В настоящее время %s-%s не поддерживается." -#: menu.sh:464 menu.sh:1252 menu.sh:2682 menu.sh:2700 +#: menu.sh:464 menu.sh:1252 menu.sh:2803 menu.sh:2821 msgid "Main menu" msgstr "Главное меню" @@ -363,11 +365,11 @@ msgstr "Ошибка" #: menu.sh:500 menu.sh:517 menu.sh:522 menu.sh:528 menu.sh:539 menu.sh:547 #: menu.sh:570 menu.sh:577 menu.sh:581 menu.sh:595 menu.sh:599 menu.sh:607 -#: menu.sh:610 +#: menu.sh:610 menu.sh:2414 menu.sh:2444 menu.sh:2595 menu.sh:2628 menu.sh:2632 msgid "Addons" msgstr "Дополнения" -#: menu.sh:501 menu.sh:631 menu.sh:807 menu.sh:942 menu.sh:1273 menu.sh:2683 +#: menu.sh:501 menu.sh:631 menu.sh:807 menu.sh:942 menu.sh:1273 menu.sh:2804 msgid "Choose a option" msgstr "Выберите опцию" @@ -388,7 +390,7 @@ msgid "Upload a external addon" msgstr "Загрузить внешнее дополнение" #: menu.sh:506 menu.sh:638 menu.sh:805 menu.sh:940 menu.sh:1278 menu.sh:1410 -#: menu.sh:2472 menu.sh:2680 menu.sh:2775 +#: menu.sh:2601 menu.sh:2801 menu.sh:2896 msgid "Exit" msgstr "Выход" @@ -420,7 +422,7 @@ msgstr "" "Имена с цветом \"\\Z4синий\\Zn\" были добавлены, с цветом \"черный\" не " "добавлены.\\n\\n" -#: menu.sh:576 menu.sh:710 menu.sh:1286 menu.sh:2546 +#: menu.sh:576 menu.sh:710 menu.sh:1286 menu.sh:2672 msgid "" "This feature is only available when accessed via ssh (Requires a terminal " "that supports ZModem protocol).\\n" @@ -432,7 +434,7 @@ msgstr "" msgid "Please upload the *.addons file." msgstr "Пожалуйста, загрузите файл *.addons." -#: menu.sh:596 menu.sh:745 menu.sh:2577 menu.sh:2602 +#: menu.sh:596 menu.sh:745 menu.sh:2703 menu.sh:2722 msgid "Not a valid file, please try again!" msgstr "Недействительный файл, пожалуйста, попробуйте снова!" @@ -451,7 +453,8 @@ msgid "File format not recognized!" msgstr "Формат файла не распознан!" #: menu.sh:630 menu.sh:644 menu.sh:657 menu.sh:694 menu.sh:711 menu.sh:721 -#: menu.sh:724 menu.sh:740 menu.sh:744 menu.sh:758 menu.sh:764 +#: menu.sh:724 menu.sh:740 menu.sh:744 menu.sh:758 menu.sh:764 menu.sh:2459 +#: menu.sh:2494 menu.sh:2596 menu.sh:2639 menu.sh:2643 msgid "Modules" msgstr "Модули" @@ -1297,7 +1300,7 @@ msgstr "Предупреждение" msgid "Config changed, would you like to rebuild the loader?" msgstr "Конфигурация изменена, хотите пересобрать загрузчик?" -#: menu.sh:2194 menu.sh:2673 +#: menu.sh:2194 menu.sh:2794 msgid "Choose a language" msgstr "Выберите язык" @@ -1309,49 +1312,52 @@ msgstr "Выберите раскладку" msgid "Choice a keymap" msgstr "Выберите карту клавиш" -#: menu.sh:2240 menu.sh:2311 menu.sh:2398 menu.sh:2484 menu.sh:2489 -#: menu.sh:2494 menu.sh:2499 menu.sh:2506 menu.sh:2514 menu.sh:2520 -#: menu.sh:2526 menu.sh:2532 menu.sh:2538 +#: menu.sh:2240 menu.sh:2317 menu.sh:2414 menu.sh:2459 menu.sh:2509 +#: menu.sh:2548 msgid "Update %s" msgstr "Обновление %s" -#: menu.sh:2242 menu.sh:2245 +#: menu.sh:2241 msgid "Checking last version ..." msgstr "Проверка последней версии ..." -#: menu.sh:2256 menu.sh:2259 menu.sh:2262 menu.sh:2268 +#: menu.sh:2257 msgid "Error checking new version.\\nError: TAG is %s" msgstr "Ошибка проверки новой версии.\\nОшибка: TAG is %s" -#: menu.sh:2271 -msgid "No new version. Actual version is %s\\nForce update?" -msgstr "Новых версий нет. Текущая версия %s\\nПринудительное обновление?" - -#: menu.sh:2275 +#: menu.sh:2270 msgid "No new version." msgstr "Новых версий нет." -#: menu.sh:2291 +#: menu.sh:2274 +msgid "Actual version is %s\\nForce update?" +msgstr "Текущая версия %s\\nПринудительное обновление?" + +#: menu.sh:2296 msgid "Downloading ..." msgstr "Загрузка ..." -#: menu.sh:2295 menu.sh:2298 menu.sh:2301 +#: menu.sh:2299 msgid "Error downloading new version.\\nError: %d:%d" msgstr "Ошибка загрузки новой версии.\\nОшибка: %d:%d" -#: menu.sh:2313 menu.sh:2316 menu.sh:2400 menu.sh:2403 -msgid "Extracting last version" -msgstr "Извлечение последней версии" +#: menu.sh:2317 menu.sh:2401 menu.sh:2594 menu.sh:2621 +msgid "RR" +msgstr "RR" -#: menu.sh:2321 menu.sh:2324 -msgid "Error extracting update file" -msgstr "Ошибка извлечения файла обновления" +#: menu.sh:2318 menu.sh:2415 menu.sh:2460 menu.sh:2510 menu.sh:2549 +msgid "Extracting update file ..." +msgstr "Извлекается файл обновления ..." -#: menu.sh:2332 menu.sh:2335 +#: menu.sh:2329 menu.sh:2426 menu.sh:2471 menu.sh:2521 menu.sh:2560 +msgid "Error extracting update file." +msgstr "Ошибка извлечения файла обновления." + +#: menu.sh:2341 msgid "Checksum do not match!" msgstr "Контрольные суммы не совпадают!" -#: menu.sh:2345 menu.sh:2348 +#: menu.sh:2355 msgid "" "The current version does not support upgrading to the latest update.zip. " "Please remake the bootloader disk!" @@ -1359,91 +1365,52 @@ msgstr "" "Текущая версия не поддерживает обновление до последней версии update.zip. " "Пожалуйста, пересоздайте диск загрузчика!" -#: menu.sh:2354 menu.sh:2357 +#: menu.sh:2365 msgid "Installing new files ..." msgstr "Установка новых файлов ..." -#: menu.sh:2387 menu.sh:2390 -msgid "RR updated with success to %s!\\nReboot?" -msgstr "RR успешно обновлен до %s!\\nПерезагрузить?" - -#: menu.sh:2410 menu.sh:2413 -msgid "Installing new %s ..." -msgstr "Установка нового %s ..." - -#: menu.sh:2445 menu.sh:2448 menu.sh:2451 +#: menu.sh:2401 menu.sh:2444 menu.sh:2494 menu.sh:2533 menu.sh:2572 msgid "%s updated with success!" msgstr "%s успешно обновлен!" -#: menu.sh:2464 -msgid "Update all" -msgstr "Обновить все" +#: menu.sh:2401 +msgid "Reboot?" +msgstr "Перезагрузка?" -#: menu.sh:2465 -msgid "Update RR" -msgstr "Обновить RR" - -#: menu.sh:2466 -msgid "Update addons" -msgstr "Обновить дополнения" - -#: menu.sh:2467 -msgid "Update modules" -msgstr "Обновить модули" - -#: menu.sh:2468 -msgid "Update LKMs" -msgstr "Обновить LKMs" - -#: menu.sh:2469 -msgid "Update CKs" -msgstr "Обновить CKs" - -#: menu.sh:2470 -msgid "Local upload" -msgstr "Локальная загрузка" - -#: menu.sh:2471 -msgid "Pre Release:" -msgstr "Предварительный выпуск:" - -#: menu.sh:2475 -msgid "" -"Manually uploading update.zip,addons.zip,modules.zip,rp-lkms.zip,rr-cks.zip " -"to /tmp/ will skip the download." -msgstr "" -"Ручная загрузка update.zip, addons.zip, modules.zip, rp-lkms.zip, rr-cks.zip " -"в /tmp/ позволит пропустить скачивание." - -#: menu.sh:2484 menu.sh:2520 -msgid "addons" -msgstr "дополнения" - -#: menu.sh:2489 menu.sh:2526 -msgid "modules" -msgstr "модули" - -#: menu.sh:2494 menu.sh:2532 +#: menu.sh:2509 menu.sh:2533 menu.sh:2597 menu.sh:2650 menu.sh:2654 msgid "LKMs" msgstr "LKMs" -#: menu.sh:2499 menu.sh:2538 +#: menu.sh:2548 menu.sh:2572 menu.sh:2598 menu.sh:2661 menu.sh:2665 msgid "CKs" msgstr "CKs" -#: menu.sh:2506 menu.sh:2514 -msgid "RR" -msgstr "RR" +#: menu.sh:2593 menu.sh:2615 +msgid "All" +msgstr "Все" -#: menu.sh:2547 +#: menu.sh:2599 +msgid "Local upload" +msgstr "Локальная загрузка" + +#: menu.sh:2600 +msgid "Pre Release:" +msgstr "Предварительный выпуск:" + +#: menu.sh:2605 menu.sh:2673 msgid "" -"Or upload update.zip, addons.zip, modules.zip, rp-lkms.zip,rr-cks.zip to /" -"tmp/ via DUFS will skip the download.\\n" +"Manually uploading update*.zip,addons*.zip,modules*.zip,rp-lkms*.zip,rr-cks*." +"zip to /tmp/ will skip the download." msgstr "" -"Или загрузите update.zip, addons.zip, modules.zip, rp-lkms.zip, rr-cks.zip " -"в /tmp/ через DUFS, чтобы пропустить скачивание.\\n" +"Ручная загрузка update*.zip, addons*.zip, modules*.zip, rp-lkms*.zip, rr-" +"cks*.zip в /tmp/ позволит пропустить скачивание." -#: menu.sh:2553 +#: menu.sh:2628 menu.sh:2639 menu.sh:2650 menu.sh:2661 +msgid "No longer supports update %s separately. Please choose to update All/RR" +msgstr "" +"Отдельное обновление%s больше не поддерживается. Выберите Обновить все/RR" + +#: menu.sh:2679 msgid "" "Please keep the attachment name consistent with the attachment name on " "Github.\\n" @@ -1451,117 +1418,114 @@ msgstr "" "Пожалуйста, сохраните имя вложения в соответствии с именем вложения на " "Github.\\n" -#: menu.sh:2554 +#: menu.sh:2680 msgid "Upload update*.zip will update RR.\\n" msgstr "Загрузка update*.zip обновит RR.\\n" -#: menu.sh:2555 +#: menu.sh:2681 msgid "Upload addons*.zip will update Addons.\\n" msgstr "Загрузка addons*.zip обновит дополнения.\\n" -#: menu.sh:2556 +#: menu.sh:2682 msgid "Upload modules*.zip will update Modules.\\n" msgstr "Загрузка modules*.zip обновит модули.\\n" -#: menu.sh:2557 +#: menu.sh:2683 msgid "Upload rp-lkms*.zip will update LKMs.\\n" msgstr "Загрузка rp-lkms*.zip обновит LKMs.\\n" -#: menu.sh:2558 +#: menu.sh:2684 msgid "Upload rr-cks*.zip will update CKs.\\n" msgstr "Загрузка rr-cks*.zip обновит CKs.\\n" -#: menu.sh:2619 +#: menu.sh:2740 msgid "This person is very lazy and hasn't written anything." msgstr "Этот человек очень ленив и ничего не написал." -#: menu.sh:2646 +#: menu.sh:2767 msgid "Choose a model" msgstr "Выберите модель" -#: menu.sh:2648 +#: menu.sh:2769 msgid "Choose a version" msgstr "Выберите версию" -#: menu.sh:2650 +#: menu.sh:2771 msgid "Parse pat" msgstr "Разобрать pat" -#: menu.sh:2657 +#: menu.sh:2778 msgid "Kernel:" msgstr "Ядро:" -#: menu.sh:2659 +#: menu.sh:2780 msgid "Addons menu" msgstr "Меню дополнений" -#: menu.sh:2660 +#: menu.sh:2781 msgid "Modules menu" msgstr "Меню модулей" -#: menu.sh:2661 +#: menu.sh:2782 msgid "Cmdline menu" msgstr "Настройка Cmdline" -#: menu.sh:2662 +#: menu.sh:2783 msgid "Synoinfo menu" msgstr "Настройка Synoinfo" -#: menu.sh:2664 +#: menu.sh:2785 msgid "Advanced menu" msgstr "Расширенные настройки" -#: menu.sh:2667 +#: menu.sh:2788 msgid "Build the loader" msgstr "Сборка загрузчика" -#: menu.sh:2671 +#: menu.sh:2792 msgid "Boot the loader" msgstr "Загрузить загрузчик" -#: menu.sh:2674 +#: menu.sh:2795 msgid "Choose a keymap" msgstr "Выбрать карту клавиш" -#: menu.sh:2676 +#: menu.sh:2797 msgid "Clean disk cache" msgstr "Очистить кэш диска" -#: menu.sh:2678 +#: menu.sh:2799 msgid "Update menu" msgstr "Меню обновлений" -#: menu.sh:2679 +#: menu.sh:2800 msgid "Notepad" msgstr "Блокнот" -#: menu.sh:2701 +#: menu.sh:2822 msgid "Change ..." msgstr "Изменять ..." -#: menu.sh:2770 +#: menu.sh:2891 msgid "Choose a action" msgstr "Выберите действие" -#: menu.sh:2771 +#: menu.sh:2892 msgid "Poweroff" msgstr "Выключение" -#: menu.sh:2772 +#: menu.sh:2893 msgid "Reboot" msgstr "Перезагрузка" -#: menu.sh:2773 +#: menu.sh:2894 msgid "Reboot to RR" msgstr "Перезагрузка в RR" -#: menu.sh:2774 +#: menu.sh:2895 msgid "Back to shell" msgstr "Вернуться в shell" -#: menu.sh:2800 +#: menu.sh:2921 msgid "Call \\033[1;32mmenu.sh\\033[0m to return to menu" msgstr "Вызовите \\033[1;32mmenu.sh\\033[0m для возврата в меню" - -#~ msgid "Custom dts file # Need rebuild" -#~ msgstr "Пользовательский файл dts # Необходима пересборка" diff --git a/files/initrd/opt/rr/lang/zh_CN.po b/files/initrd/opt/rr/lang/zh_CN.po index 4d816887..97615324 100644 --- a/files/initrd/opt/rr/lang/zh_CN.po +++ b/files/initrd/opt/rr/lang/zh_CN.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: RR\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-03-03 02:12+0800\n" -"PO-Revision-Date: 2024-03-03 02:18+0800\n" +"POT-Creation-Date: 2024-03-06 01:44+0800\n" +"PO-Revision-Date: 2024-03-06 01:48+0800\n" "Last-Translator: Ing \n" "Language-Team: Chinese (simplified) \n" "Language: zh_CN\n" @@ -301,8 +301,10 @@ msgid "" msgstr "" "请通过 DUFS 将 pat 文件上传到 /mnt/p3/users/ 文件夹，然后重新输入此选项.\\n" -#: menu.sh:350 menu.sh:360 menu.sh:2474 menu.sh:2548 menu.sh:2559 menu.sh:2576 -#: menu.sh:2601 +#: menu.sh:350 menu.sh:360 menu.sh:2593 menu.sh:2594 menu.sh:2595 menu.sh:2596 +#: menu.sh:2597 menu.sh:2598 menu.sh:2604 menu.sh:2627 menu.sh:2638 +#: menu.sh:2649 menu.sh:2660 menu.sh:2674 menu.sh:2685 menu.sh:2702 +#: menu.sh:2721 msgid "Update" msgstr "更新" @@ -326,7 +328,7 @@ msgstr "目前，不支持 %s." msgid "Currently, %s of %s is not supported." msgstr "目前，不支持 %s-%s." -#: menu.sh:464 menu.sh:1252 menu.sh:2682 menu.sh:2700 +#: menu.sh:464 menu.sh:1252 menu.sh:2803 menu.sh:2821 msgid "Main menu" msgstr "主菜单" @@ -340,11 +342,11 @@ msgstr "错误" #: menu.sh:500 menu.sh:517 menu.sh:522 menu.sh:528 menu.sh:539 menu.sh:547 #: menu.sh:570 menu.sh:577 menu.sh:581 menu.sh:595 menu.sh:599 menu.sh:607 -#: menu.sh:610 +#: menu.sh:610 menu.sh:2414 menu.sh:2444 menu.sh:2595 menu.sh:2628 menu.sh:2632 msgid "Addons" msgstr "插件" -#: menu.sh:501 menu.sh:631 menu.sh:807 menu.sh:942 menu.sh:1273 menu.sh:2683 +#: menu.sh:501 menu.sh:631 menu.sh:807 menu.sh:942 menu.sh:1273 menu.sh:2804 msgid "Choose a option" msgstr "选择一个选项" @@ -365,7 +367,7 @@ msgid "Upload a external addon" msgstr "上传外部插件" #: menu.sh:506 menu.sh:638 menu.sh:805 menu.sh:940 menu.sh:1278 menu.sh:1410 -#: menu.sh:2472 menu.sh:2680 menu.sh:2775 +#: menu.sh:2601 menu.sh:2801 menu.sh:2896 msgid "Exit" msgstr "退出" @@ -395,7 +397,7 @@ msgid "" "not added.\\n\\n" msgstr "名称颜色为\"\\Z4蓝色\\Zn\"的为已添加, 颜色为\"黑色\"的为未添加.\\n\\n" -#: menu.sh:576 menu.sh:710 menu.sh:1286 menu.sh:2546 +#: menu.sh:576 menu.sh:710 menu.sh:1286 menu.sh:2672 msgid "" "This feature is only available when accessed via ssh (Requires a terminal " "that supports ZModem protocol).\\n" @@ -405,7 +407,7 @@ msgstr "此功能仅在通过 ssh 访问时可用(需要支持 ZModem 协议的 msgid "Please upload the *.addons file." msgstr "请上传 *.addons 文件." -#: menu.sh:596 menu.sh:745 menu.sh:2577 menu.sh:2602 +#: menu.sh:596 menu.sh:745 menu.sh:2703 menu.sh:2722 msgid "Not a valid file, please try again!" msgstr "不是有效的文件, 请重试!" @@ -422,7 +424,8 @@ msgid "File format not recognized!" msgstr "文件格式无法识别!" #: menu.sh:630 menu.sh:644 menu.sh:657 menu.sh:694 menu.sh:711 menu.sh:721 -#: menu.sh:724 menu.sh:740 menu.sh:744 menu.sh:758 menu.sh:764 +#: menu.sh:724 menu.sh:740 menu.sh:744 menu.sh:758 menu.sh:764 menu.sh:2459 +#: menu.sh:2494 menu.sh:2596 menu.sh:2639 menu.sh:2643 msgid "Modules" msgstr "模块" @@ -1210,7 +1213,7 @@ msgstr "警告" msgid "Config changed, would you like to rebuild the loader?" msgstr "配置已更改, 是否重新编译引导?" -#: menu.sh:2194 menu.sh:2673 +#: menu.sh:2194 menu.sh:2794 msgid "Choose a language" msgstr "选择语言" @@ -1222,258 +1225,215 @@ msgstr "选择布局" msgid "Choice a keymap" msgstr "选择键盘映射" -#: menu.sh:2240 menu.sh:2311 menu.sh:2398 menu.sh:2484 menu.sh:2489 -#: menu.sh:2494 menu.sh:2499 menu.sh:2506 menu.sh:2514 menu.sh:2520 -#: menu.sh:2526 menu.sh:2532 menu.sh:2538 +#: menu.sh:2240 menu.sh:2317 menu.sh:2414 menu.sh:2459 menu.sh:2509 +#: menu.sh:2548 msgid "Update %s" msgstr "更新 %s" -#: menu.sh:2242 menu.sh:2245 +#: menu.sh:2241 msgid "Checking last version ..." msgstr "检测新版本中 ..." -#: menu.sh:2256 menu.sh:2259 menu.sh:2262 menu.sh:2268 +#: menu.sh:2257 msgid "Error checking new version.\\nError: TAG is %s" msgstr "检测新版本错误.\\nError: TAG is %s" -#: menu.sh:2271 -msgid "No new version. Actual version is %s\\nForce update?" -msgstr "没有新版本. 实际版本为 %s\\n强制更新?" - -#: menu.sh:2275 +#: menu.sh:2270 msgid "No new version." msgstr "没有新版本." -#: menu.sh:2291 +#: menu.sh:2274 +msgid "Actual version is %s\\nForce update?" +msgstr "实际版本为 %s\\n强制更新?" + +#: menu.sh:2296 msgid "Downloading ..." msgstr "下载中 ..." -#: menu.sh:2295 menu.sh:2298 menu.sh:2301 +#: menu.sh:2299 msgid "Error downloading new version.\\nError: %d:%d" msgstr "下载新版本错误.\\nError: %d:%d" -#: menu.sh:2313 menu.sh:2316 menu.sh:2400 menu.sh:2403 -msgid "Extracting last version" -msgstr "解压新版本" +#: menu.sh:2317 menu.sh:2401 menu.sh:2594 menu.sh:2621 +msgid "RR" +msgstr "RR" -#: menu.sh:2321 menu.sh:2324 -msgid "Error extracting update file" -msgstr "更新文件解压错误" +#: menu.sh:2318 menu.sh:2415 menu.sh:2460 menu.sh:2510 menu.sh:2549 +msgid "Extracting update file ..." +msgstr "解压更新文件 ..." -#: menu.sh:2332 menu.sh:2335 +#: menu.sh:2329 menu.sh:2426 menu.sh:2471 menu.sh:2521 menu.sh:2560 +msgid "Error extracting update file." +msgstr "更新文件解压错误." + +#: menu.sh:2341 msgid "Checksum do not match!" msgstr "Checksum 不匹配!" -#: menu.sh:2345 menu.sh:2348 +#: menu.sh:2355 msgid "" "The current version does not support upgrading to the latest update.zip. " "Please remake the bootloader disk!" msgstr "当前版本不支持最新的 update.zip 升级, 请重新制作引导盘!" -#: menu.sh:2354 menu.sh:2357 +#: menu.sh:2365 msgid "Installing new files ..." msgstr "安装更新中 ..." -#: menu.sh:2387 menu.sh:2390 -msgid "RR updated with success to %s!\\nReboot?" -msgstr "RR 更新成功 %s!\\n重启?" - -#: menu.sh:2410 menu.sh:2413 -msgid "Installing new %s ..." -msgstr "安装新 %s 中 ..." - -#: menu.sh:2445 menu.sh:2448 menu.sh:2451 +#: menu.sh:2401 menu.sh:2444 menu.sh:2494 menu.sh:2533 menu.sh:2572 msgid "%s updated with success!" msgstr "%s 更新成功!" -#: menu.sh:2464 -msgid "Update all" -msgstr "更新全部" +#: menu.sh:2401 +msgid "Reboot?" +msgstr "重启?" -#: menu.sh:2465 -msgid "Update RR" -msgstr "更新 RR" - -#: menu.sh:2466 -msgid "Update addons" -msgstr "更新插件" - -#: menu.sh:2467 -msgid "Update modules" -msgstr "更新模块" - -#: menu.sh:2468 -msgid "Update LKMs" -msgstr "更新LKMs" - -#: menu.sh:2469 -msgid "Update CKs" -msgstr "更新 CKs" - -#: menu.sh:2470 -msgid "Local upload" -msgstr "本地上传" - -#: menu.sh:2471 -msgid "Pre Release:" -msgstr "预发布:" - -#: menu.sh:2475 -msgid "" -"Manually uploading update.zip,addons.zip,modules.zip,rp-lkms.zip,rr-cks.zip " -"to /tmp/ will skip the download." -msgstr "" -"手动上传 update.zip,addons.zip,modules.zip,rp-lkms.zip,rr-cks.zip 到 /tmp/ 将" -"跳过下载." - -#: menu.sh:2484 menu.sh:2520 -msgid "addons" -msgstr "插件" - -#: menu.sh:2489 menu.sh:2526 -msgid "modules" -msgstr "模块" - -#: menu.sh:2494 menu.sh:2532 +#: menu.sh:2509 menu.sh:2533 menu.sh:2597 menu.sh:2650 menu.sh:2654 msgid "LKMs" msgstr "LKMs" -#: menu.sh:2499 menu.sh:2538 +#: menu.sh:2548 menu.sh:2572 menu.sh:2598 menu.sh:2661 menu.sh:2665 msgid "CKs" msgstr "CKs" -#: menu.sh:2506 menu.sh:2514 -msgid "RR" -msgstr "RR" +#: menu.sh:2593 menu.sh:2615 +msgid "All" +msgstr "全部" -#: menu.sh:2547 +#: menu.sh:2599 +msgid "Local upload" +msgstr "本地上传" + +#: menu.sh:2600 +msgid "Pre Release:" +msgstr "预发布:" + +#: menu.sh:2605 menu.sh:2673 msgid "" -"Or upload update.zip, addons.zip, modules.zip, rp-lkms.zip,rr-cks.zip to /" -"tmp/ via DUFS will skip the download.\\n" +"Manually uploading update*.zip,addons*.zip,modules*.zip,rp-lkms*.zip,rr-cks*." +"zip to /tmp/ will skip the download." msgstr "" -"或者通过 DUFS 上传 update.zip, addons.zip, modules.zip, rp-lkms.zip, rr-cks." -"zip 到 /tmp/ 将跳过下载.\\n" +"手动上传 update*.zip,addons*.zip,modules*.zip,rp-lkms*.zip,rr-cks*.zip 到 /" +"tmp/ 将跳过下载." -#: menu.sh:2553 +#: menu.sh:2628 menu.sh:2639 menu.sh:2650 menu.sh:2661 +msgid "No longer supports update %s separately. Please choose to update All/RR" +msgstr "不再支持单独更新%s. 请选择更新全部/RR" + +#: menu.sh:2679 msgid "" "Please keep the attachment name consistent with the attachment name on " "Github.\\n" msgstr "请保持附件名称与 github 上附件名称一致.\\n" -#: menu.sh:2554 +#: menu.sh:2680 msgid "Upload update*.zip will update RR.\\n" msgstr "上传 update*.zip 将更新 RR.\\n" -#: menu.sh:2555 +#: menu.sh:2681 msgid "Upload addons*.zip will update Addons.\\n" msgstr "上传 addons*.zip 将更新 插件.\\n" -#: menu.sh:2556 +#: menu.sh:2682 msgid "Upload modules*.zip will update Modules.\\n" msgstr "上传 modules*.zip 将更新 模块.\\n" -#: menu.sh:2557 +#: menu.sh:2683 msgid "Upload rp-lkms*.zip will update LKMs.\\n" msgstr "上传 rp-lkms*.zip 将更新 LKMs.\\n" -#: menu.sh:2558 +#: menu.sh:2684 msgid "Upload rr-cks*.zip will update CKs.\\n" msgstr "上传 rr-cks*.zip 将更新 CKs.\\n" -#: menu.sh:2619 +#: menu.sh:2740 msgid "This person is very lazy and hasn't written anything." msgstr "这个人很懒, 什么也没有写." -#: menu.sh:2646 +#: menu.sh:2767 msgid "Choose a model" msgstr "选择型号" -#: menu.sh:2648 +#: menu.sh:2769 msgid "Choose a version" msgstr "选择版本" -#: menu.sh:2650 +#: menu.sh:2771 msgid "Parse pat" msgstr "解析 pat" -#: menu.sh:2657 +#: menu.sh:2778 msgid "Kernel:" msgstr "内核:" -#: menu.sh:2659 +#: menu.sh:2780 msgid "Addons menu" msgstr "插件" -#: menu.sh:2660 +#: menu.sh:2781 msgid "Modules menu" msgstr "模块" -#: menu.sh:2661 +#: menu.sh:2782 msgid "Cmdline menu" msgstr "设置 Cmdline" -#: menu.sh:2662 +#: menu.sh:2783 msgid "Synoinfo menu" msgstr "设置 Synoinfo" -#: menu.sh:2664 +#: menu.sh:2785 msgid "Advanced menu" msgstr "高级设置" -#: menu.sh:2667 +#: menu.sh:2788 msgid "Build the loader" msgstr "编译引导" -#: menu.sh:2671 +#: menu.sh:2792 msgid "Boot the loader" msgstr "启动" -#: menu.sh:2674 +#: menu.sh:2795 msgid "Choose a keymap" msgstr "选择键盘" -#: menu.sh:2676 +#: menu.sh:2797 msgid "Clean disk cache" msgstr "清除磁盘缓存" -#: menu.sh:2678 +#: menu.sh:2799 msgid "Update menu" msgstr "更新" -#: menu.sh:2679 +#: menu.sh:2800 msgid "Notepad" msgstr "备注" -#: menu.sh:2701 +#: menu.sh:2822 msgid "Change ..." msgstr "改变 ..." -#: menu.sh:2770 +#: menu.sh:2891 msgid "Choose a action" msgstr "选择动作" -#: menu.sh:2771 +#: menu.sh:2892 msgid "Poweroff" msgstr "关机" -#: menu.sh:2772 +#: menu.sh:2893 msgid "Reboot" msgstr "重启" -#: menu.sh:2773 +#: menu.sh:2894 msgid "Reboot to RR" msgstr "重启到 RR" -#: menu.sh:2774 +#: menu.sh:2895 msgid "Back to shell" msgstr "退出到 shell" -#: menu.sh:2800 +#: menu.sh:2921 msgid "Call \\033[1;32mmenu.sh\\033[0m to return to menu" msgstr "执行 \\033[1;32mmenu.sh\\033[0m 重新进入设置菜单" - -#~ msgid "Custom dts file" -#~ msgstr "自定义 dts 文件" - -#~ msgid "DTS" -#~ msgstr "DTS" diff --git a/files/initrd/opt/rr/lang/zh_HK.po b/files/initrd/opt/rr/lang/zh_HK.po index 5b4659c5..d6094868 100644 --- a/files/initrd/opt/rr/lang/zh_HK.po +++ b/files/initrd/opt/rr/lang/zh_HK.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: RR\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-03-03 02:12+0800\n" -"PO-Revision-Date: 2024-03-03 02:18+0800\n" +"POT-Creation-Date: 2024-03-06 01:44+0800\n" +"PO-Revision-Date: 2024-03-06 01:50+0800\n" "Last-Translator: Ing \n" "Language-Team: Chinese (HongKong) \n" "Language: zh_HK\n" @@ -301,8 +301,10 @@ msgid "" msgstr "" "請透過 DUFS 將 pat 檔案上傳到 /mnt/p3/users/ 資料夾，然後重新进入此選項.\\n" -#: menu.sh:350 menu.sh:360 menu.sh:2474 menu.sh:2548 menu.sh:2559 menu.sh:2576 -#: menu.sh:2601 +#: menu.sh:350 menu.sh:360 menu.sh:2593 menu.sh:2594 menu.sh:2595 menu.sh:2596 +#: menu.sh:2597 menu.sh:2598 menu.sh:2604 menu.sh:2627 menu.sh:2638 +#: menu.sh:2649 menu.sh:2660 menu.sh:2674 menu.sh:2685 menu.sh:2702 +#: menu.sh:2721 msgid "Update" msgstr "更新" @@ -326,7 +328,7 @@ msgstr "目前，不支援 %s." msgid "Currently, %s of %s is not supported." msgstr "目前，不支援 %s-%s." -#: menu.sh:464 menu.sh:1252 menu.sh:2682 menu.sh:2700 +#: menu.sh:464 menu.sh:1252 menu.sh:2803 menu.sh:2821 msgid "Main menu" msgstr "主選單" @@ -340,11 +342,11 @@ msgstr "錯誤" #: menu.sh:500 menu.sh:517 menu.sh:522 menu.sh:528 menu.sh:539 menu.sh:547 #: menu.sh:570 menu.sh:577 menu.sh:581 menu.sh:595 menu.sh:599 menu.sh:607 -#: menu.sh:610 +#: menu.sh:610 menu.sh:2414 menu.sh:2444 menu.sh:2595 menu.sh:2628 menu.sh:2632 msgid "Addons" msgstr "挿件" -#: menu.sh:501 menu.sh:631 menu.sh:807 menu.sh:942 menu.sh:1273 menu.sh:2683 +#: menu.sh:501 menu.sh:631 menu.sh:807 menu.sh:942 menu.sh:1273 menu.sh:2804 msgid "Choose a option" msgstr "設定" @@ -365,7 +367,7 @@ msgid "Upload a external addon" msgstr "上傳外部挿件" #: menu.sh:506 menu.sh:638 menu.sh:805 menu.sh:940 menu.sh:1278 menu.sh:1410 -#: menu.sh:2472 menu.sh:2680 menu.sh:2775 +#: menu.sh:2601 menu.sh:2801 menu.sh:2896 msgid "Exit" msgstr "退出" @@ -395,7 +397,7 @@ msgid "" "not added.\\n\\n" msgstr "名稱顏色為\"\\Z4藍色\\Zn\"的為已添加, 顏色為\"黑色\"的為未添加..\\n\\n" -#: menu.sh:576 menu.sh:710 menu.sh:1286 menu.sh:2546 +#: menu.sh:576 menu.sh:710 menu.sh:1286 menu.sh:2672 msgid "" "This feature is only available when accessed via ssh (Requires a terminal " "that supports ZModem protocol).\\n" @@ -405,7 +407,7 @@ msgstr "此功能僅通過 ssh 訪問時可用(需要支援 ZModem 協定的終 msgid "Please upload the *.addons file." msgstr "請上傳 *.addons 檔案." -#: menu.sh:596 menu.sh:745 menu.sh:2577 menu.sh:2602 +#: menu.sh:596 menu.sh:745 menu.sh:2703 menu.sh:2722 msgid "Not a valid file, please try again!" msgstr "不是有效的檔案, 請重試!" @@ -422,7 +424,8 @@ msgid "File format not recognized!" msgstr "檔案格式無法識別!" #: menu.sh:630 menu.sh:644 menu.sh:657 menu.sh:694 menu.sh:711 menu.sh:721 -#: menu.sh:724 menu.sh:740 menu.sh:744 menu.sh:758 menu.sh:764 +#: menu.sh:724 menu.sh:740 menu.sh:744 menu.sh:758 menu.sh:764 menu.sh:2459 +#: menu.sh:2494 menu.sh:2596 menu.sh:2639 menu.sh:2643 msgid "Modules" msgstr "模塊" @@ -1210,7 +1213,7 @@ msgstr "警告" msgid "Config changed, would you like to rebuild the loader?" msgstr "配寘已更改, 是否重新編譯引導?" -#: menu.sh:2194 menu.sh:2673 +#: menu.sh:2194 menu.sh:2794 msgid "Choose a language" msgstr "選擇語言" @@ -1222,255 +1225,215 @@ msgstr "選擇佈局" msgid "Choice a keymap" msgstr "選擇鍵盤" -#: menu.sh:2240 menu.sh:2311 menu.sh:2398 menu.sh:2484 menu.sh:2489 -#: menu.sh:2494 menu.sh:2499 menu.sh:2506 menu.sh:2514 menu.sh:2520 -#: menu.sh:2526 menu.sh:2532 menu.sh:2538 +#: menu.sh:2240 menu.sh:2317 menu.sh:2414 menu.sh:2459 menu.sh:2509 +#: menu.sh:2548 msgid "Update %s" msgstr "更新 %s" -#: menu.sh:2242 menu.sh:2245 +#: menu.sh:2241 msgid "Checking last version ..." msgstr "檢測新版本中 ..." -#: menu.sh:2256 menu.sh:2259 menu.sh:2262 menu.sh:2268 +#: menu.sh:2257 msgid "Error checking new version.\\nError: TAG is %s" msgstr "檢測新版本錯誤.\\nError: TAG is %s" -#: menu.sh:2271 -msgid "No new version. Actual version is %s\\nForce update?" -msgstr "沒有新版本. 實際版本為 %s\\n強制更新?" - -#: menu.sh:2275 +#: menu.sh:2270 msgid "No new version." msgstr "沒有新版本." -#: menu.sh:2291 +#: menu.sh:2274 +msgid "Actual version is %s\\nForce update?" +msgstr "實際版本為 %s\\n強制更新?" + +#: menu.sh:2296 msgid "Downloading ..." msgstr "下載中 ..." -#: menu.sh:2295 menu.sh:2298 menu.sh:2301 +#: menu.sh:2299 msgid "Error downloading new version.\\nError: %d:%d" msgstr "下載新版本錯誤.\\nError: %d:%d" -#: menu.sh:2313 menu.sh:2316 menu.sh:2400 menu.sh:2403 -msgid "Extracting last version" -msgstr "解壓新版本" +#: menu.sh:2317 menu.sh:2401 menu.sh:2594 menu.sh:2621 +msgid "RR" +msgstr "RR" -#: menu.sh:2321 menu.sh:2324 -msgid "Error extracting update file" -msgstr "更新檔案解壓錯誤" +#: menu.sh:2318 menu.sh:2415 menu.sh:2460 menu.sh:2510 menu.sh:2549 +msgid "Extracting update file ..." +msgstr "解壓更新檔案 ..." -#: menu.sh:2332 menu.sh:2335 +#: menu.sh:2329 menu.sh:2426 menu.sh:2471 menu.sh:2521 menu.sh:2560 +msgid "Error extracting update file." +msgstr "更新檔案解壓錯誤." + +#: menu.sh:2341 msgid "Checksum do not match!" msgstr "Checksum 不匹配!" -#: menu.sh:2345 menu.sh:2348 +#: menu.sh:2355 msgid "" "The current version does not support upgrading to the latest update.zip. " "Please remake the bootloader disk!" msgstr "當前版本不支持最新的 update.zip 陞級, 請重新製作引導盤!" -#: menu.sh:2354 menu.sh:2357 +#: menu.sh:2365 msgid "Installing new files ..." msgstr "安裝更新中 ..." -#: menu.sh:2387 menu.sh:2390 -msgid "RR updated with success to %s!\\nReboot?" -msgstr "RR 更新成功 %s!\\n重啓?" - -#: menu.sh:2410 menu.sh:2413 -msgid "Installing new %s ..." -msgstr "安裝新 %s 中 ..." - -#: menu.sh:2445 menu.sh:2448 menu.sh:2451 +#: menu.sh:2401 menu.sh:2444 menu.sh:2494 menu.sh:2533 menu.sh:2572 msgid "%s updated with success!" msgstr "%s 更新成功!" -#: menu.sh:2464 -msgid "Update all" -msgstr "更新全部" +#: menu.sh:2401 +msgid "Reboot?" +msgstr "重啓?" -#: menu.sh:2465 -msgid "Update RR" -msgstr "更新 RR" - -#: menu.sh:2466 -msgid "Update addons" -msgstr "更新挿件" - -#: menu.sh:2467 -msgid "Update modules" -msgstr "更新模塊" - -#: menu.sh:2468 -msgid "Update LKMs" -msgstr "更新LKMs" - -#: menu.sh:2469 -msgid "Update CKs" -msgstr "更新 CKs" - -#: menu.sh:2470 -msgid "Local upload" -msgstr "本地上傳" - -#: menu.sh:2471 -msgid "Pre Release:" -msgstr "預發佈:" - -#: menu.sh:2475 -msgid "" -"Manually uploading update.zip,addons.zip,modules.zip,rp-lkms.zip,rr-cks.zip " -"to /tmp/ will skip the download." -msgstr "" -"手動上傳 update.zip,addons.zip,modules.zip,rp-lkms.zip,rr-cks.zip 到 /tmp/ 將" -"跳過下載." - -#: menu.sh:2484 menu.sh:2520 -msgid "addons" -msgstr "挿件" - -#: menu.sh:2489 menu.sh:2526 -msgid "modules" -msgstr "模塊" - -#: menu.sh:2494 menu.sh:2532 +#: menu.sh:2509 menu.sh:2533 menu.sh:2597 menu.sh:2650 menu.sh:2654 msgid "LKMs" msgstr "LKMs" -#: menu.sh:2499 menu.sh:2538 +#: menu.sh:2548 menu.sh:2572 menu.sh:2598 menu.sh:2661 menu.sh:2665 msgid "CKs" msgstr "CKs" -#: menu.sh:2506 menu.sh:2514 -msgid "RR" -msgstr "RR" +#: menu.sh:2593 menu.sh:2615 +msgid "All" +msgstr "全部" -#: menu.sh:2547 +#: menu.sh:2599 +msgid "Local upload" +msgstr "本地上傳" + +#: menu.sh:2600 +msgid "Pre Release:" +msgstr "預發佈:" + +#: menu.sh:2605 menu.sh:2673 msgid "" -"Or upload update.zip, addons.zip, modules.zip, rp-lkms.zip,rr-cks.zip to /" -"tmp/ via DUFS will skip the download.\\n" +"Manually uploading update*.zip,addons*.zip,modules*.zip,rp-lkms*.zip,rr-cks*." +"zip to /tmp/ will skip the download." msgstr "" -"或透過 DUFS 上傳 update.zip, addons.zip, modules.zip, rp-lkms.zip, rr-cks." -"zip 到 /tmp/ 將跳過下載。\\n" +"手動上傳 update*.zip,addons*.zip,modules*.zip,rp-lkms*.zip,rr-cks*.zip 到 /" +"tmp/ 將跳過下載." -#: menu.sh:2553 +#: menu.sh:2628 menu.sh:2639 menu.sh:2650 menu.sh:2661 +msgid "No longer supports update %s separately. Please choose to update All/RR" +msgstr "不再支持單獨更新%s. 請選擇更新全部/RR" + +#: menu.sh:2679 msgid "" "Please keep the attachment name consistent with the attachment name on " "Github.\\n" msgstr "請保持附件名稱與 github 上附件名稱一致.\\n" -#: menu.sh:2554 +#: menu.sh:2680 msgid "Upload update*.zip will update RR.\\n" msgstr "上傳 update*.zip 将更新 RR.\\n" -#: menu.sh:2555 +#: menu.sh:2681 msgid "Upload addons*.zip will update Addons.\\n" msgstr "上傳 addons*.zip 将更新 挿件.\\n" -#: menu.sh:2556 +#: menu.sh:2682 msgid "Upload modules*.zip will update Modules.\\n" msgstr "上傳 modules*.zip 将更新 模塊.\\n" -#: menu.sh:2557 +#: menu.sh:2683 msgid "Upload rp-lkms*.zip will update LKMs.\\n" msgstr "上傳 rp-lkms*.zip 将更新 LKMs.\\n" -#: menu.sh:2558 +#: menu.sh:2684 msgid "Upload rr-cks*.zip will update CKs.\\n" msgstr "上傳 rr-cks*.zip 将更新 CKs.\\n" -#: menu.sh:2619 +#: menu.sh:2740 msgid "This person is very lazy and hasn't written anything." msgstr "這個人很懶, 什麼也沒有寫." -#: menu.sh:2646 +#: menu.sh:2767 msgid "Choose a model" msgstr "選擇型號" -#: menu.sh:2648 +#: menu.sh:2769 msgid "Choose a version" msgstr "選擇版本" -#: menu.sh:2650 +#: menu.sh:2771 msgid "Parse pat" msgstr "解析 pat" -#: menu.sh:2657 +#: menu.sh:2778 msgid "Kernel:" msgstr "核心:" -#: menu.sh:2659 +#: menu.sh:2780 msgid "Addons menu" msgstr "挿件" -#: menu.sh:2660 +#: menu.sh:2781 msgid "Modules menu" msgstr "模塊" -#: menu.sh:2661 +#: menu.sh:2782 msgid "Cmdline menu" msgstr "設定 Cmdline" -#: menu.sh:2662 +#: menu.sh:2783 msgid "Synoinfo menu" msgstr "設定 Synoinfo" -#: menu.sh:2664 +#: menu.sh:2785 msgid "Advanced menu" msgstr "高級設定" -#: menu.sh:2667 +#: menu.sh:2788 msgid "Build the loader" msgstr "編譯引導" -#: menu.sh:2671 +#: menu.sh:2792 msgid "Boot the loader" msgstr "啟動" -#: menu.sh:2674 +#: menu.sh:2795 msgid "Choose a keymap" msgstr "選擇鍵盤" -#: menu.sh:2676 +#: menu.sh:2797 msgid "Clean disk cache" msgstr "清除磁碟緩存" -#: menu.sh:2678 +#: menu.sh:2799 msgid "Update menu" msgstr "更新" -#: menu.sh:2679 +#: menu.sh:2800 msgid "Notepad" msgstr "備註" -#: menu.sh:2701 +#: menu.sh:2822 msgid "Change ..." msgstr "改變 ..." -#: menu.sh:2770 +#: menu.sh:2891 msgid "Choose a action" msgstr "選擇動作" -#: menu.sh:2771 +#: menu.sh:2892 msgid "Poweroff" msgstr "關機" -#: menu.sh:2772 +#: menu.sh:2893 msgid "Reboot" msgstr "重啓" -#: menu.sh:2773 +#: menu.sh:2894 msgid "Reboot to RR" msgstr "重啓到 RR" -#: menu.sh:2774 +#: menu.sh:2895 msgid "Back to shell" msgstr "退出到 shell" -#: menu.sh:2800 +#: menu.sh:2921 msgid "Call \\033[1;32mmenu.sh\\033[0m to return to menu" msgstr "執行 \\033[1;32mmenu.sh\\033[0m 重新進入設定選單" - -#~ msgid "Custom dts file # Need rebuild" -#~ msgstr "自定義dts檔案 # 需要重新編譯" diff --git a/files/initrd/opt/rr/lang/zh_TW.po b/files/initrd/opt/rr/lang/zh_TW.po index e0db81d6..a8235acd 100644 --- a/files/initrd/opt/rr/lang/zh_TW.po +++ b/files/initrd/opt/rr/lang/zh_TW.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: RR\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-02-18 21:57+0800\n" -"PO-Revision-Date: 2024-03-04 20:52+0800\n" +"POT-Creation-Date: 2024-03-06 01:44+0800\n" +"PO-Revision-Date: 2024-03-06 01:52+0800\n" "Last-Translator: March Fun \n" "Language-Team: Chinese (Taiwan) \n" "Language: zh_TW\n" @@ -34,7 +34,9 @@ msgid "DSM zImage changed" msgstr "DSM zImage 已變更" #: boot.sh:36 menu.sh:1236 -msgid "zImage not patched,\\nPlease upgrade the bootloader version and try again.\\nPatch error:\\n" +msgid "" +"zImage not patched,\\nPlease upgrade the bootloader version and try again." +"\\nPatch error:\\n" msgstr "zImage 未修補，\\n請升級開機載入程式版本然後重試。\\n修補錯誤:\\n" #: boot.sh:44 @@ -42,7 +44,9 @@ msgid "DSM Ramdisk changed" msgstr "DSM Ramdisk 已變更" #: boot.sh:47 menu.sh:1242 -msgid "Ramdisk not patched,\\nPlease upgrade the bootloader version and try again.\\nPatch error:\\n" +msgid "" +"Ramdisk not patched,\\nPlease upgrade the bootloader version and try again." +"\\nPatch error:\\n" msgstr "Ramdisk 未修補，\\n請升級開機載入程式版本然後重試。\\n修補錯誤:\\n" #: boot.sh:65 @@ -74,11 +78,15 @@ msgid "MEM: " msgstr "MEM: " #: boot.sh:74 -msgid "The current version of bootloader does not support booting %s-%s, please upgrade and rebuild." +msgid "" +"The current version of bootloader does not support booting %s-%s, please " +"upgrade and rebuild." msgstr "目前版本的開機載入程式不支援啟動 %s-%s，請升級並重建。" #: boot.sh:86 -msgid "Please insert at least one sata/scsi disk for system installation, except for the bootloader disk." +msgid "" +"Please insert at least one sata/scsi disk for system installation, except " +"for the bootloader disk." msgstr "除了開機碟之外，請至少插入一個 sata/scsi 磁碟以進行系統安裝。" #: boot.sh:169 @@ -138,8 +146,12 @@ msgid "Booting ..." msgstr "開機中..." #: boot.sh:272 -msgid "[This interface will not be operational. Please wait a few minutes.\\nFind DSM via http://find.synology.com/ or Synology Assistant and connect.]" -msgstr "[該介面已無法操作。請於數分鐘後透過\\n http://find.synology.com/ 或者 Synology Assistant 搜尋 DSM 並連線。]" +msgid "" +"[This interface will not be operational. Please wait a few minutes.\\nFind " +"DSM via http://find.synology.com/ or Synology Assistant and connect.]" +msgstr "" +"[該介面已無法操作。請於數分鐘後透過\\n http://find.synology.com/ 或者 " +"Synology Assistant 搜尋 DSM 並連線。]" #: init.sh:23 msgid "Network devices not found!" @@ -166,8 +178,11 @@ msgid "Waiting IP." msgstr "正在取得 IP。" #: init.sh:162 -msgid "Access \\033[1;34mhttp://%s:7681\\033[0m to configure the loader via web terminal." -msgstr "在瀏覽器中瀏覽 \\033[1;34mhttp://%s:7681\\033[0m 進入 WEB 終端進行設置。" +msgid "" +"Access \\033[1;34mhttp://%s:7681\\033[0m to configure the loader via web " +"terminal." +msgstr "" +"在瀏覽器中瀏覽 \\033[1;34mhttp://%s:7681\\033[0m 進入 WEB 終端進行設置。" #: init.sh:172 msgid "Call \\033[1;32mmenu.sh\\033[0m to configure loader" @@ -194,7 +209,9 @@ msgid "Default SSH Root password is" msgstr "預設 SSH 的 root 密碼為" #: init.sh:196 -msgid "You have less than 4GB of RAM, if errors occur in loader creation, please increase the amount of memory." +msgid "" +"You have less than 4GB of RAM, if errors occur in loader creation, please " +"increase the amount of memory." msgstr "您的記憶體不足 4GB，如果在建立開機檔時出現錯誤，請增加記憶體。" #: menu.sh:102 menu.sh:136 menu.sh:179 @@ -231,11 +248,14 @@ msgid "Choose a product version" msgstr "選擇產品版本" #: menu.sh:242 -msgid "The current version has been set to %s. Do you want to reset the version?" +msgid "" +"The current version has been set to %s. Do you want to reset the version?" msgstr "目前版本已設定為 %s。是否要重設版本？" #: menu.sh:248 -msgid "This version does not support UEFI startup, Please select another version or switch the startup mode." +msgid "" +"This version does not support UEFI startup, Please select another version or " +"switch the startup mode." msgstr "該版本不支援 UEFI 開機，請選擇其他版本或者切換開機模式。" #: menu.sh:259 @@ -243,7 +263,9 @@ msgid "Get pat data ..." msgstr "取得 pat 資料..." #: menu.sh:278 -msgid "Failed to get pat data,\\nPlease manually fill in the URL and md5sum of the corresponding version of pat." +msgid "" +"Failed to get pat data,\\nPlease manually fill in the URL and md5sum of the " +"corresponding version of pat." msgstr "取得 pat 資料失敗，\\n請手動填寫相對版本 pat 的 URL 和 MD5。" #: menu.sh:282 @@ -259,7 +281,9 @@ msgid "Reconfiguring Synoinfo, Addons and Modules" msgstr "重新設置 Syninfo、增益集和模組" #: menu.sh:339 -msgid "You have selected the %s and %s.\\n'Parse Pat' will overwrite the previous selection.\\nDo you want to continue?" +msgid "" +"You have selected the %s and %s.\\n'Parse Pat' will overwrite the previous " +"selection.\\nDo you want to continue?" msgstr "您已選擇 %s 和 %s。\\n\"解析 Pat\" 將覆蓋之前的選擇。\\n是否要繼續 ?" #: menu.sh:340 @@ -271,11 +295,16 @@ msgid "No pat file found in users folder!\\n" msgstr "在使用者資料夾中找不到 pat 檔案 !\\n" #: menu.sh:349 -msgid "Please upload the pat file to /mnt/p3/users/ folder via DUFS and re-enter this option.\\n" -msgstr "請透過 DUFS 將 pat 檔上傳到 /mnt/p3/users/ 資料夾，然後重新進入此選項。\\n" +msgid "" +"Please upload the pat file to /mnt/p3/users/ folder via DUFS and re-enter " +"this option.\\n" +msgstr "" +"請透過 DUFS 將 pat 檔上傳到 /mnt/p3/users/ 資料夾，然後重新進入此選項。\\n" -#: menu.sh:350 menu.sh:360 menu.sh:2474 menu.sh:2548 menu.sh:2559 menu.sh:2576 -#: menu.sh:2601 +#: menu.sh:350 menu.sh:360 menu.sh:2593 menu.sh:2594 menu.sh:2595 menu.sh:2596 +#: menu.sh:2597 menu.sh:2598 menu.sh:2604 menu.sh:2627 menu.sh:2638 +#: menu.sh:2649 menu.sh:2660 menu.sh:2674 menu.sh:2685 menu.sh:2702 +#: menu.sh:2721 msgid "Update" msgstr "更新" @@ -299,7 +328,7 @@ msgstr "目前不支援 %s。" msgid "Currently, %s of %s is not supported." msgstr "目前不支援 %s 中的 %s。" -#: menu.sh:464 menu.sh:1252 menu.sh:2682 menu.sh:2700 +#: menu.sh:464 menu.sh:1252 menu.sh:2803 menu.sh:2821 msgid "Main menu" msgstr "主功能表" @@ -313,11 +342,11 @@ msgstr "錯誤" #: menu.sh:500 menu.sh:517 menu.sh:522 menu.sh:528 menu.sh:539 menu.sh:547 #: menu.sh:570 menu.sh:577 menu.sh:581 menu.sh:595 menu.sh:599 menu.sh:607 -#: menu.sh:610 +#: menu.sh:610 menu.sh:2414 menu.sh:2444 menu.sh:2595 menu.sh:2628 menu.sh:2632 msgid "Addons" msgstr "增益集" -#: menu.sh:501 menu.sh:631 menu.sh:807 menu.sh:942 menu.sh:1273 menu.sh:2683 +#: menu.sh:501 menu.sh:631 menu.sh:807 menu.sh:942 menu.sh:1273 menu.sh:2804 msgid "Choose a option" msgstr "選擇選項" @@ -338,7 +367,7 @@ msgid "Upload a external addon" msgstr "上傳外部增益集" #: menu.sh:506 menu.sh:638 menu.sh:805 menu.sh:940 menu.sh:1278 menu.sh:1410 -#: menu.sh:2472 menu.sh:2680 menu.sh:2775 +#: menu.sh:2601 menu.sh:2801 menu.sh:2896 msgid "Exit" msgstr "退出" @@ -363,18 +392,23 @@ msgid "Select addon to remove" msgstr "選擇要删除的增益集" #: menu.sh:561 -msgid "Name with color \"\\Z4blue\\Zn\" have been added, with color \"black\" are not added.\\n\\n" -msgstr "名稱色彩為 \"\\Z4藍色\\Zn\" 者為已加入，色彩為 \"黑色\" 者為未加入。\\n\\n" +msgid "" +"Name with color \"\\Z4blue\\Zn\" have been added, with color \"black\" are " +"not added.\\n\\n" +msgstr "" +"名稱色彩為 \"\\Z4藍色\\Zn\" 者為已加入，色彩為 \"黑色\" 者為未加入。\\n\\n" -#: menu.sh:576 menu.sh:710 menu.sh:1286 menu.sh:2546 -msgid "This feature is only available when accessed via ssh (Requires a terminal that supports ZModem protocol).\\n" +#: menu.sh:576 menu.sh:710 menu.sh:1286 menu.sh:2672 +msgid "" +"This feature is only available when accessed via ssh (Requires a terminal " +"that supports ZModem protocol).\\n" msgstr "此功能僅在透過 ssh 存取時可用。(需要支援 ZModem 協定的終端)。\\n" #: menu.sh:582 msgid "Please upload the *.addons file." msgstr "請上傳 *.addons 檔案。" -#: menu.sh:596 menu.sh:745 menu.sh:2577 menu.sh:2602 +#: menu.sh:596 menu.sh:745 menu.sh:2703 menu.sh:2722 msgid "Not a valid file, please try again!" msgstr "不是有效的檔案，請重試！" @@ -391,7 +425,8 @@ msgid "File format not recognized!" msgstr "檔案格式無法識別！" #: menu.sh:630 menu.sh:644 menu.sh:657 menu.sh:694 menu.sh:711 menu.sh:721 -#: menu.sh:724 menu.sh:740 menu.sh:744 menu.sh:758 menu.sh:764 +#: menu.sh:724 menu.sh:740 menu.sh:744 menu.sh:758 menu.sh:764 menu.sh:2459 +#: menu.sh:2494 menu.sh:2596 menu.sh:2639 menu.sh:2643 msgid "Modules" msgstr "模組" @@ -440,20 +475,32 @@ msgid "Selecting loaded modules" msgstr "選擇已識別的模組" #: menu.sh:716 -msgid "This function is experimental and dangerous. If you don't know much, please exit.\\n" +msgid "" +"This function is experimental and dangerous. If you don't know much, please " +"exit.\\n" msgstr "該功能是實驗性質且具有風險，如果你不瞭解，請退出。\\n" #: menu.sh:717 -msgid "The imported .ko of this function will be implanted into the corresponding arch's modules package, which will affect all models of the arch.\\n" +msgid "" +"The imported .ko of this function will be implanted into the corresponding " +"arch's modules package, which will affect all models of the arch.\\n" msgstr "該功能匯入 .ko 將植入相對架構的模組套件。這將影響該架構的所有型號。\\n" #: menu.sh:718 -msgid "This program will not determine the availability of imported modules or even make type judgments, as please double check if it is correct.\\n" -msgstr "該程式不會判斷匯入的驅動模組的可用性，甚至不會做類型判斷，因此請再三確認是否正確。\\n" +msgid "" +"This program will not determine the availability of imported modules or even " +"make type judgments, as please double check if it is correct.\\n" +msgstr "" +"該程式不會判斷匯入的驅動模組的可用性，甚至不會做類型判斷，因此請再三確認是否" +"正確。\\n" #: menu.sh:719 -msgid "If you want to remove it, please go to the \"Update Menu\" -> \"Update modules\" to forcibly update the modules. All imports will be reset.\\n" -msgstr "如果您想删除它，請前往「更新 -> 更新模組」強制更新模組。所有匯入都將被重設。\\n" +msgid "" +"If you want to remove it, please go to the \"Update Menu\" -> \"Update " +"modules\" to forcibly update the modules. All imports will be reset.\\n" +msgstr "" +"如果您想删除它，請前往「更新 -> 更新模組」強制更新模組。所有匯入都將被重" +"設。\\n" #: menu.sh:720 msgid "Do you want to continue?" @@ -505,15 +552,24 @@ msgid "Commonly used cmdlines:\\n" msgstr "常用的 cmdlines:\\n" #: menu.sh:814 -msgid " * \\Z4disable_mtrr_trim=\\Zn\\n disables kernel trim any uncacheable memory out.\\n" -msgstr " * \\Z4disable_mtrr_trim=\\Zn\\n 停用核心修剪任何不可快取的記憶體。\\n" +msgid "" +" * \\Z4disable_mtrr_trim=\\Zn\\n disables kernel trim any uncacheable " +"memory out.\\n" +msgstr "" +" * \\Z4disable_mtrr_trim=\\Zn\\n 停用核心修剪任何不可快取的記憶體。\\n" #: menu.sh:815 -msgid " * \\Z4intel_idle.max_cstate=1\\Zn\\n Set the maximum C-state depth allowed by the intel_idle driver.\\n" -msgstr " * \\Z4intel_idle.max_cstate=1\\Zn\\n 設定 intel_idle 驅動程式允許的最大 C-狀態 深度。\\n" +msgid "" +" * \\Z4intel_idle.max_cstate=1\\Zn\\n Set the maximum C-state depth " +"allowed by the intel_idle driver.\\n" +msgstr "" +" * \\Z4intel_idle.max_cstate=1\\Zn\\n 設定 intel_idle 驅動程式允許的最大 C-" +"狀態 深度。\\n" #: menu.sh:816 -msgid " * \\Z4pcie_port_pm=off\\Zn\\n Turn off the power management of the PCIe port.\\n" +msgid "" +" * \\Z4pcie_port_pm=off\\Zn\\n Turn off the power management of the PCIe " +"port.\\n" msgstr " * \\Z4pcie_port_pm=off\\Zn\\n 關閉 PCIe 埠的電源管理。\\n" #: menu.sh:817 @@ -525,16 +581,25 @@ msgid " * \\Z4SataPortMap=??\\Zn\\n Sata Port Map.\\n" msgstr " * \\Z4SataPortMap=??\\Zn\\n Sata 埠地圖。\\n" #: menu.sh:819 -msgid " * \\Z4DiskIdxMap=??\\Zn\\n Disk Index Map, Modify disk name sequence.\\n" +msgid "" +" * \\Z4DiskIdxMap=??\\Zn\\n Disk Index Map, Modify disk name sequence.\\n" msgstr " * \\Z4DiskIdxMap=??\\Zn\\n 磁碟索引地圖，修改磁碟名稱順序。\\n" #: menu.sh:820 -msgid " * \\Z4i915.enable_guc=2\\Zn\\n Enable the GuC firmware on Intel graphics hardware.(value: 1,2 or 3)\\n" -msgstr " * \\Z4i915.enable_guc=2\\Zn\\n 在 Intel 圖形硬體上啟用 GuC 韌體。(值：1、2 或 3)\\n" +msgid "" +" * \\Z4i915.enable_guc=2\\Zn\\n Enable the GuC firmware on Intel graphics " +"hardware.(value: 1,2 or 3)\\n" +msgstr "" +" * \\Z4i915.enable_guc=2\\Zn\\n 在 Intel 圖形硬體上啟用 GuC 韌體。(值：1、" +"2 或 3)\\n" #: menu.sh:821 -msgid " * \\Z4i915.max_vfs=7\\Zn\\n Set the maximum number of virtual functions (VFs) that can be created for Intel graphics hardware.\\n" -msgstr " * \\Z4i915.max_vfs=7\\Zn\\n 設定 Intel 圖形硬體可以建立的最大虛擬功能 (VF) 數。\\n" +msgid "" +" * \\Z4i915.max_vfs=7\\Zn\\n Set the maximum number of virtual functions " +"(VFs) that can be created for Intel graphics hardware.\\n" +msgstr "" +" * \\Z4i915.max_vfs=7\\Zn\\n 設定 Intel 圖形硬體可以建立的最大虛擬功能 " +"(VF) 數。\\n" #: menu.sh:822 menu.sh:953 msgid "\\nEnter the parameter name and value you need to add.\\n" @@ -625,7 +690,9 @@ msgid "Encrypted" msgstr "已加密" #: menu.sh:1087 -msgid "Could not determine if pat file is encrypted or not, maybe corrupted, try again!" +msgid "" +"Could not determine if pat file is encrypted or not, maybe corrupted, try " +"again!" msgstr "無法確定 pat 檔案是否加密，可能已損壞，請重試！" #: menu.sh:1094 menu.sh:1186 @@ -649,7 +716,8 @@ msgid "Cleaning cache ..." msgstr "清除快取..." #: menu.sh:1154 -msgid "Based on the current network situation, switch to %s mirror to downloading." +msgid "" +"Based on the current network situation, switch to %s mirror to downloading." msgstr "根據目前的網路狀況，已切換到 %s 鏡像伺服器進行下載。" #: menu.sh:1157 @@ -661,7 +729,9 @@ msgid "Checking hash of %s: " msgstr "檢查 %s 的雜湊值: " #: menu.sh:1179 -msgid "md5 hash of pat not match, Please reget pat data from the version menu and try again!" +msgid "" +"md5 hash of pat not match, Please reget pat data from the version menu and " +"try again!" msgstr "pat 的 md5 雜湊值不相符，請自版本功能表中重新取得 pat 資料並再試一次！" #: menu.sh:1182 menu.sh:1198 menu.sh:1208 @@ -710,12 +780,18 @@ msgid "Edit dts file" msgstr "編輯 dts 檔案" #: menu.sh:1287 -msgid "Or upload the dts file to %s via DUFS, Will be automatically imported when building." +msgid "" +"Or upload the dts file to %s via DUFS, Will be automatically imported when " +"building." msgstr "或者透過 DUFS 將 dts 檔案上傳到 %s，建構時會自動匯入。" #: menu.sh:1293 -msgid "Currently, only dts format files are supported. Please prepare and click to confirm uploading.\\n(saved in /mnt/p3/users/)" -msgstr "目前只支援 dts 格式的檔案，請準備並點選確認上傳。\\n(儲存於 /mnt/p3/users/ 中)" +msgid "" +"Currently, only dts format files are supported. Please prepare and click to " +"confirm uploading.\\n(saved in /mnt/p3/users/)" +msgstr "" +"目前只支援 dts 格式的檔案，請準備並點選確認上傳。\\n(儲存於 /mnt/p3/users/ " +"中)" #: menu.sh:1310 menu.sh:1346 msgid "Not a valid dts file, please try again!" @@ -892,7 +968,9 @@ msgid "\\nTotal of ports: %s\\n" msgstr "\\n埠總數: %s\\n" #: menu.sh:1663 -msgid "\\nPorts with color \\Z1red\\Zn as DUMMY, color \\Z2\\Zbgreen\\Zn has drive connected." +msgid "" +"\\nPorts with color \\Z1red\\Zn as DUMMY, color \\Z2\\Zbgreen\\Zn has drive " +"connected." msgstr "\\n\\Z1紅色\\Zn 為空，\\Z2\\Zb綠色\\Zn 為已連接磁碟機。" #: menu.sh:1670 @@ -900,7 +978,9 @@ msgid "pat: (editable)" msgstr "pat: (可編輯)" #: menu.sh:1686 -msgid "This feature will allow you to downgrade the installation by removing the VERSION file from the first partition of all disks.\\n" +msgid "" +"This feature will allow you to downgrade the installation by removing the " +"VERSION file from the first partition of all disks.\\n" msgstr "此功能透過删除所有磁碟第一個分區的 VERSION 檔案以允許你降級安裝。\\n" #: menu.sh:1687 @@ -908,7 +988,9 @@ msgid "Therefore, please insert all disks before continuing.\\n" msgstr "因此，請插入所有磁碟後再繼續。\\n" #: menu.sh:1688 menu.sh:1729 -msgid "Warning:\\nThis operation is irreversible. Please backup important data. Do you want to continue?" +msgid "" +"Warning:\\nThis operation is irreversible. Please backup important data. Do " +"you want to continue?" msgstr "警告:\\n該作業不可逆，請提前備份重要資料。是否繼續？" #: menu.sh:1703 @@ -924,7 +1006,8 @@ msgid "No disk found!" msgstr "未找到磁碟！" #: menu.sh:1733 -msgid "Warning:\\nThe current hds is in raid, do you still want to format them?" +msgid "" +"Warning:\\nThe current hds is in raid, do you still want to format them?" msgstr "警告:\\n目前的硬碟使用 raid 中，是否仍要格式化？" #: menu.sh:1748 @@ -976,11 +1059,14 @@ msgid "Telnet&SSH is not enabled." msgstr "Telnet 及 SSH 未啟用。" #: menu.sh:1843 -msgid "Warning:\\nDo not terminate midway, otherwise it may cause damage to the RR. Do you want to continue?" +msgid "" +"Warning:\\nDo not terminate midway, otherwise it may cause damage to the RR. " +"Do you want to continue?" msgstr "警告:\\n請不要中途停止，否則將導致 RR 開機損毀，是否繼續？" #: menu.sh:1846 -msgid "Saving ...\\n(It usually takes 5-10 minutes, please be patient and wait.)" +msgid "" +"Saving ...\\n(It usually takes 5-10 minutes, please be patient and wait.)" msgstr "儲存中...\\n(通常需要 5-10 分鐘，請耐心等候)。" #: menu.sh:1861 @@ -1016,19 +1102,27 @@ msgid "Disk %s size is less than 1GB and cannot be cloned!" msgstr "磁碟 %s 大小小於 1GB，無法複製！" #: menu.sh:1926 -msgid "Warning:\\nDisk %s will be formatted and written to the bootloader. Please confirm that important data has been backed up. \\nDo you want to continue?" -msgstr "警告:\\n磁碟 %s 將被格式化並寫入開機程式。請確認重要資料已備份。\\n是否要繼續？" +msgid "" +"Warning:\\nDisk %s will be formatted and written to the bootloader. Please " +"confirm that important data has been backed up. \\nDo you want to continue?" +msgstr "" +"警告:\\n磁碟 %s 將被格式化並寫入開機程式。請確認重要資料已備份。\\n是否要繼" +"續？" #: menu.sh:1959 msgid "Cloning ..." msgstr "複製中..." #: menu.sh:1961 -msgid "Bootloader has been cloned to disk %s, please remove the current bootloader disk!\\nReboot?" +msgid "" +"Bootloader has been cloned to disk %s, please remove the current bootloader " +"disk!\\nReboot?" msgstr "開機程式已複製到磁碟 %s，請移除目前的開機磁碟！\\n重新啟動？" #: menu.sh:1972 -msgid "Please via %s to download the logs,\\nAnd go to github to create an issue and upload the logs." +msgid "" +"Please via %s to download the logs,\\nAnd go to github to create an issue " +"and upload the logs." msgstr "請透過 %s 下載記錄，\\n並前往 github 建立問題並上傳記錄。" #: menu.sh:1976 @@ -1056,15 +1150,21 @@ msgid " 3. Reboot into RR and go to this option.\\n" msgstr " 3. 重新啟動進入 RR 並前往此選項。\\n" #: menu.sh:1991 -msgid "This option only installs opkg package management, allowing you to install more tools for use and debugging. Do you want to continue?" -msgstr "該選項僅安裝 opkg 套件管理工具，讓你能?安裝更多的工具以供使用和除錯，是否繼續 ?" +msgid "" +"This option only installs opkg package management, allowing you to install " +"more tools for use and debugging. Do you want to continue?" +msgstr "" +"該選項僅安裝 opkg 套件管理工具，讓你能?安裝更多的工具以供使用和除錯，是否繼" +"續 ?" #: menu.sh:1998 msgid "opkg installing ..." msgstr "opkg 安裝中..." #: menu.sh:2000 -msgid "opkg install is complete. Please reconnect to ssh/web, or execute 'source ~/.bashrc'" +msgid "" +"opkg install is complete. Please reconnect to ssh/web, or execute 'source ~/." +"bashrc'" msgstr "opkg 安裝完成。請重新連線 ssh/web，或者執行「source ~/.bashrc」" #: menu.sh:2012 @@ -1084,7 +1184,9 @@ msgid "It is expected that all restrictions on DSM will be lifted,\\n" msgstr "預期可以去掉所有 DSM 的限制，\\n" #: menu.sh:2071 -msgid "But since upgrading is not supported, I don not want to implement it for the time being.\\n" +msgid "" +"But since upgrading is not supported, I don not want to implement it for the " +"time being.\\n" msgstr "但是由於不支援升級，因此暫時不想實現它。\\n" #: menu.sh:2083 menu.sh:2118 menu.sh:2125 @@ -1115,7 +1217,7 @@ msgstr "警告" msgid "Config changed, would you like to rebuild the loader?" msgstr "設置已變更，是否重新編譯開機檔？" -#: menu.sh:2194 menu.sh:2673 +#: menu.sh:2194 menu.sh:2794 msgid "Choose a language" msgstr "選擇語言" @@ -1127,243 +1229,215 @@ msgstr "選擇佈局" msgid "Choice a keymap" msgstr "選擇鍵盤" -#: menu.sh:2240 menu.sh:2311 menu.sh:2398 menu.sh:2484 menu.sh:2489 -#: menu.sh:2494 menu.sh:2499 menu.sh:2506 menu.sh:2514 menu.sh:2520 -#: menu.sh:2526 menu.sh:2532 menu.sh:2538 +#: menu.sh:2240 menu.sh:2317 menu.sh:2414 menu.sh:2459 menu.sh:2509 +#: menu.sh:2548 msgid "Update %s" msgstr "更新 %s" -#: menu.sh:2242 menu.sh:2245 +#: menu.sh:2241 msgid "Checking last version ..." msgstr "檢測最新版本..." -#: menu.sh:2256 menu.sh:2259 menu.sh:2262 menu.sh:2268 +#: menu.sh:2257 msgid "Error checking new version.\\nError: TAG is %s" msgstr "檢查新版本時錯誤。\\n錯誤: TAG 為 %s" -#: menu.sh:2271 -msgid "No new version. Actual version is %s\\nForce update?" -msgstr "沒有新版本。實際版本為 %s\\n強制更新？" - -#: menu.sh:2275 +#: menu.sh:2270 msgid "No new version." msgstr "沒有新版本。" -#: menu.sh:2291 +#: menu.sh:2274 +msgid "Actual version is %s\\nForce update?" +msgstr "實際版本為 %s\\n強制更新？" + +#: menu.sh:2296 msgid "Downloading ..." msgstr "下載中..." -#: menu.sh:2295 menu.sh:2298 menu.sh:2301 +#: menu.sh:2299 msgid "Error downloading new version.\\nError: %d:%d" msgstr "下載新版本時錯誤。\\n錯誤: %d:%d" -#: menu.sh:2313 menu.sh:2316 menu.sh:2400 menu.sh:2403 -msgid "Extracting last version" -msgstr "解壓縮最新版本" - -#: menu.sh:2321 menu.sh:2324 -msgid "Error extracting update file" -msgstr "解壓縮更新檔錯誤" - -#: menu.sh:2332 menu.sh:2335 -msgid "Checksum do not match!" -msgstr "總和檢查碼不相符！" - -#: menu.sh:2345 menu.sh:2348 -msgid "The current version does not support upgrading to the latest update.zip. Please remake the bootloader disk!" -msgstr "目前版本不支援升級到最新的 update.zip。請重新製作開機程式磁碟！" - -#: menu.sh:2354 menu.sh:2357 -msgid "Installing new files ..." -msgstr "安裝新的檔案..." - -#: menu.sh:2387 menu.sh:2390 -msgid "RR updated with success to %s!\\nReboot?" -msgstr "RR 更新成功 %s！\\n重新開機？" - -#: menu.sh:2410 menu.sh:2413 -msgid "Installing new %s ..." -msgstr "安裝新的 %s..." - -#: menu.sh:2445 menu.sh:2448 menu.sh:2451 -msgid "%s updated with success!" -msgstr "%s 更新成功！" - -#: menu.sh:2464 -msgid "Update all" -msgstr "更新全部" - -#: menu.sh:2465 -msgid "Update RR" -msgstr "更新 RR" - -#: menu.sh:2466 -msgid "Update addons" -msgstr "更新增益集" - -#: menu.sh:2467 -msgid "Update modules" -msgstr "更新模組" - -#: menu.sh:2468 -msgid "Update LKMs" -msgstr "更新 LKM" - -#: menu.sh:2469 -msgid "Update CKs" -msgstr "更新 CK" - -#: menu.sh:2470 -msgid "Local upload" -msgstr "本地上傳" - -#: menu.sh:2471 -msgid "Pre Release:" -msgstr "預發佈:" - -#: menu.sh:2475 -msgid "Manually uploading update.zip,addons.zip,modules.zip,rp-lkms.zip,rr-cks.zip to /tmp/ will skip the download." -msgstr "手動上傳 update.zip,addons.zip,modules.zip,rp-lkms.zip,rr-cks.zip 到 /tmp/ 將跳過下載。" - -#: menu.sh:2484 menu.sh:2520 -msgid "addons" -msgstr "增益集" - -#: menu.sh:2489 menu.sh:2526 -msgid "modules" -msgstr "模組" - -#: menu.sh:2494 menu.sh:2532 -msgid "LKMs" -msgstr "LKMs" - -#: menu.sh:2499 menu.sh:2538 -msgid "CKs" -msgstr "CKs" - -#: menu.sh:2506 menu.sh:2514 +#: menu.sh:2317 menu.sh:2401 menu.sh:2594 menu.sh:2621 msgid "RR" msgstr "RR" -#: menu.sh:2547 -msgid "Or upload update.zip, addons.zip, modules.zip, rp-lkms.zip,rr-cks.zip to /tmp/ via DUFS will skip the download.\\n" -msgstr "或者透過 DUFS 將 update.zip, addons.zip, modules.zip, rp-lkms.zip,rr-cks.zip 上傳到 /tmp/ 將跳過下載。\\n" +#: menu.sh:2318 menu.sh:2415 menu.sh:2460 menu.sh:2510 menu.sh:2549 +msgid "Extracting update file ..." +msgstr "解壓縮更新檔 ..." -#: menu.sh:2553 -msgid "Please keep the attachment name consistent with the attachment name on Github.\\n" +#: menu.sh:2329 menu.sh:2426 menu.sh:2471 menu.sh:2521 menu.sh:2560 +msgid "Error extracting update file." +msgstr "解壓縮更新檔錯誤." + +#: menu.sh:2341 +msgid "Checksum do not match!" +msgstr "總和檢查碼不相符！" + +#: menu.sh:2355 +msgid "" +"The current version does not support upgrading to the latest update.zip. " +"Please remake the bootloader disk!" +msgstr "目前版本不支援升級到最新的 update.zip。請重新製作開機程式磁碟！" + +#: menu.sh:2365 +msgid "Installing new files ..." +msgstr "安裝新的檔案..." + +#: menu.sh:2401 menu.sh:2444 menu.sh:2494 menu.sh:2533 menu.sh:2572 +msgid "%s updated with success!" +msgstr "%s 更新成功！" + +#: menu.sh:2401 +msgid "Reboot?" +msgstr "重新開機?" + +#: menu.sh:2509 menu.sh:2533 menu.sh:2597 menu.sh:2650 menu.sh:2654 +msgid "LKMs" +msgstr "LKMs" + +#: menu.sh:2548 menu.sh:2572 menu.sh:2598 menu.sh:2661 menu.sh:2665 +msgid "CKs" +msgstr "CKs" + +#: menu.sh:2593 menu.sh:2615 +msgid "All" +msgstr "全部" + +#: menu.sh:2599 +msgid "Local upload" +msgstr "本地上傳" + +#: menu.sh:2600 +msgid "Pre Release:" +msgstr "預發佈:" + +#: menu.sh:2605 menu.sh:2673 +msgid "" +"Manually uploading update*.zip,addons*.zip,modules*.zip,rp-lkms*.zip,rr-cks*." +"zip to /tmp/ will skip the download." +msgstr "" +"手動上傳 update*.zip,addons*.zip,modules*.zip,rp-lkms*.zip,rr-cks*.zip 到 /" +"tmp/ 將跳過下載。" + +#: menu.sh:2628 menu.sh:2639 menu.sh:2650 menu.sh:2661 +msgid "No longer supports update %s separately. Please choose to update All/RR" +msgstr "不再支持單獨更新%s. 請選擇更新全部/RR" + +#: menu.sh:2679 +msgid "" +"Please keep the attachment name consistent with the attachment name on " +"Github.\\n" msgstr "請保持附件名稱與 Github 上的附件名稱一致。\\n" -#: menu.sh:2554 +#: menu.sh:2680 msgid "Upload update*.zip will update RR.\\n" msgstr "上傳 update*.zip 將更新 RR。\\n" -#: menu.sh:2555 +#: menu.sh:2681 msgid "Upload addons*.zip will update Addons.\\n" msgstr "上傳 addons*.zip 將更新增益集。\\n" -#: menu.sh:2556 +#: menu.sh:2682 msgid "Upload modules*.zip will update Modules.\\n" msgstr "上傳 modules*.zip 將更新模組。\\n" -#: menu.sh:2557 +#: menu.sh:2683 msgid "Upload rp-lkms*.zip will update LKMs.\\n" msgstr "上傳 rp-lkms*.zip 將更新 LKM。\\n" -#: menu.sh:2558 +#: menu.sh:2684 msgid "Upload rr-cks*.zip will update CKs.\\n" msgstr "上傳 rr-cks*.zip 將更新 CK。\\n" -#: menu.sh:2619 +#: menu.sh:2740 msgid "This person is very lazy and hasn't written anything." msgstr "這個人很懶，什麼也沒有寫。" -#: menu.sh:2646 +#: menu.sh:2767 msgid "Choose a model" msgstr "選擇型號" -#: menu.sh:2648 +#: menu.sh:2769 msgid "Choose a version" msgstr "選擇版本" -#: menu.sh:2650 +#: menu.sh:2771 msgid "Parse pat" msgstr "解析 pat" -#: menu.sh:2657 +#: menu.sh:2778 msgid "Kernel:" msgstr "核心:" -#: menu.sh:2659 +#: menu.sh:2780 msgid "Addons menu" msgstr "增益集" -#: menu.sh:2660 +#: menu.sh:2781 msgid "Modules menu" msgstr "模組" -#: menu.sh:2661 +#: menu.sh:2782 msgid "Cmdline menu" msgstr "設定 Cmdline" -#: menu.sh:2662 +#: menu.sh:2783 msgid "Synoinfo menu" msgstr "設定 Synoinfo" -#: menu.sh:2664 +#: menu.sh:2785 msgid "Advanced menu" msgstr "進階設定" -#: menu.sh:2667 +#: menu.sh:2788 msgid "Build the loader" msgstr "編譯開機檔" -#: menu.sh:2671 +#: menu.sh:2792 msgid "Boot the loader" msgstr "開機" -#: menu.sh:2674 +#: menu.sh:2795 msgid "Choose a keymap" msgstr "選擇鍵盤" -#: menu.sh:2676 +#: menu.sh:2797 msgid "Clean disk cache" msgstr "清除磁碟快取" -#: menu.sh:2678 +#: menu.sh:2799 msgid "Update menu" msgstr "更新" -#: menu.sh:2679 +#: menu.sh:2800 msgid "Notepad" msgstr "記事本" -#: menu.sh:2701 +#: menu.sh:2822 msgid "Change ..." msgstr "變更..." -#: menu.sh:2770 +#: menu.sh:2891 msgid "Choose a action" msgstr "選擇動作" -#: menu.sh:2771 +#: menu.sh:2892 msgid "Poweroff" msgstr "關機" -#: menu.sh:2772 +#: menu.sh:2893 msgid "Reboot" msgstr "重新開機" -#: menu.sh:2773 +#: menu.sh:2894 msgid "Reboot to RR" msgstr "重新開機進入 RR" -#: menu.sh:2774 +#: menu.sh:2895 msgid "Back to shell" msgstr "退回到 shell" -#: menu.sh:2800 +#: menu.sh:2921 msgid "Call \\033[1;32mmenu.sh\\033[0m to return to menu" msgstr "執行 \\033[1;32mmenu.sh\\033[0m 重新回到功能表" - -#~ msgid "Custom dts file # Need rebuild" -#~ msgstr "自訂 dts 檔案 # 需要重新編譯" diff --git a/files/initrd/opt/rr/menu.sh b/files/initrd/opt/rr/menu.sh index 698be5b3..03124d08 100755 --- a/files/initrd/opt/rr/menu.sh +++ b/files/initrd/opt/rr/menu.sh @@ -21,7 +21,7 @@ fi IP="$(getIP)" # Debug flag -# DEBUG=0 +# DEBUG="" MODEL="$(readConfigKey "model" "${USER_CONFIG_FILE}")" PRODUCTVER="$(readConfigKey "productver" "${USER_CONFIG_FILE}")" @@ -2238,12 +2238,14 @@ function downloadExts() { PROXY="$(readConfigKey "github_proxy" "${USER_CONFIG_FILE}")" [ -n "${PROXY}" ] && [[ "${PROXY: -1}" != "/" ]] && PROXY="${PROXY}/" T="$(printf "$(TEXT "Update %s")" "${1}")" + MSG="$(TEXT "Checking last version ...")" if [ "${5}" = "-1" ]; then - echo "$(TEXT "Checking last version ...")" + echo "${T} - ${MSG}" else DIALOG --title "${T}" \ - --infobox "$(TEXT "Checking last version ...")" 0 0 + --infobox "${MSG}" 0 0 fi + TAG="" if [ "${PRERELEASE}" = "true" ]; then TAG="$(curl -skL --connect-timeout 10 "${PROXY}${3}/tags" | grep /refs/tags/.*\.zip | head -1 | sed -r 's/.*\/refs\/tags\/(.*)\.zip.*$/\1/')" else @@ -2252,178 +2254,232 @@ function downloadExts() { fi [ "${TAG:0:1}" = "v" ] && TAG="${TAG:1}" if [ -z "${TAG}" -o "${TAG}" = "latest" ]; then + MSG="$(printf "$(TEXT "Error checking new version.\nError: TAG is %s")" "${TAG}")" if [ "${5}" = "-1" ]; then - echo "$(printf "$(TEXT "Error checking new version.\nError: TAG is %s")" "${TAG}")" + echo "${T} - ${MSG}" elif [ "${5}" = "0" ]; then DIALOG --title "${T}" \ - --msgbox "$(printf "$(TEXT "Error checking new version.\nError: TAG is %s")" "${TAG}")" 0 0 + --msgbox "${MSG}" 0 0 else DIALOG --title "${T}" \ - --infobox "$(printf "$(TEXT "Error checking new version.\nError: TAG is %s")" "${TAG}")" 0 0 + --infobox "${MSG}" 0 0 fi return 1 fi if [ "${2}" = "${TAG}" ]; then + MSG="$(TEXT "No new version.")" if [ "${5}" = "-1" ]; then - echo "$(printf "$(TEXT "Error checking new version.\nError: TAG is %s")" "${TAG}")" + echo "${T} - ${MSG}" elif [ "${5}" = "0" ]; then + MSG+="$(printf "$(TEXT "Actual version is %s\nForce update?")" "${2}")" DIALOG --title "${T}" \ - --yesno "$(printf "$(TEXT "No new version. Actual version is %s\nForce update?")" "${2}")" 0 0 + --yesno "${MSG}" 0 0 [ $? -ne 0 ] && return 1 else DIALOG --title "${T}" \ - --infobox "$(TEXT "No new version.")" 0 0 + --infobox "${MSG}" 0 0 return 1 fi fi if [ "${5}" = "-1" ]; then ( - rm -f "${TMP_PATH}/${4}.zip" - STATUS=$(curl -kL --connect-timeout 10 -w "%{http_code}" "${PROXY}${3}/releases/download/${TAG}/${4}.zip" -o "${TMP_PATH}/${4}.zip") + rm -f ${TMP_PATH}/${4}*.zip + STATUS=$(curl -kL --connect-timeout 10 -w "%{http_code}" "${PROXY}${3}/releases/download/${TAG}/${4}-${TAG}.zip" -o "${TMP_PATH}/${4}-${TAG}.zip") RET=$? ) 2>&1 else ( - rm -f "${TMP_PATH}/${4}.zip" - STATUS=$(curl -kL --connect-timeout 10 -w "%{http_code}" "${PROXY}${3}/releases/download/${TAG}/${4}.zip" -o "${TMP_PATH}/${4}.zip") + rm -f ${TMP_PATH}/${4}*.zip + STATUS=$(curl -kL --connect-timeout 10 -w "%{http_code}" "${PROXY}${3}/releases/download/${TAG}/${4}-${TAG}.zip" -o "${TMP_PATH}/${4}-${TAG}.zip") RET=$? ) 2>&1 | DIALOG --title "${T}" \ --progressbox "$(TEXT "Downloading ...")" 20 100 fi if [ ${RET} -ne 0 -o ${STATUS:-0} -ne 200 ]; then + MSG="$(printf "$(TEXT "Error downloading new version.\nError: %d:%d")" "${RET}" "${STATUS}")" if [ "${5}" = "-1" ]; then - echo "$(printf "$(TEXT "Error downloading new version.\nError: %d:%d")" "${RET}" "${STATUS}")" + echo "${T} - ${MSG}" elif [ "${5}" = "0" ]; then DIALOG --title "${T}" \ - --msgbox "$(printf "$(TEXT "Error downloading new version.\nError: %d:%d")" "${RET}" "${STATUS}")" 0 0 + --msgbox "${MSG}" 0 0 else DIALOG --title "${T}" \ - --infobox "$(printf "$(TEXT "Error downloading new version.\nError: %d:%d")" "${RET}" "${STATUS}")" 0 0 + --infobox "${MSG}" 0 0 fi return 1 fi return 0 } -# 1 - ext name +# 1 - update file # 2 - silent function updateRR() { - T="$(printf "$(TEXT "Update %s")" "${1}")" + T="$(printf "$(TEXT "Update %s")" "$(TEXT "RR")")" + MSG="$(TEXT "Extracting update file ...")" if [ "${2}" = "-1" ]; then - echo "${T} - $(TEXT "Extracting last version")" + echo "${T} - ${MSG}" else DIALOG --title "${T}" \ - --infobox "$(TEXT "Extracting last version")" 0 0 + --infobox "${MSG}" 0 0 fi - unzip -oq "${TMP_PATH}/update.zip" -d "${TMP_PATH}/" + rm -rf "${TMP_PATH}/update" + mkdir -p "${TMP_PATH}/update" + unzip -oq "${1}" -d "${TMP_PATH}/update" if [ $? -ne 0 ]; then + MSG="$(TEXT "Error extracting update file.")" if [ "${2}" = "-1" ]; then - echo "${T} - $(TEXT "Error extracting update file")" + echo "${T} - ${MSG}" else DIALOG --title "${T}" \ - --msgbox "$(TEXT "Error extracting update file")" 0 0 + --msgbox "${MSG}" 0 0 fi return 1 fi # Check checksums - (cd /tmp && sha256sum --status -c sha256sum) + (cd "${TMP_PATH}/update" && sha256sum --status -c sha256sum) if [ $? -ne 0 ]; then + MSG="$(TEXT "Checksum do not match!")" if [ "${2}" = "-1" ]; then - echo "${T} - $(TEXT "Checksum do not match!")" + echo "${T} - ${MSG}" else DIALOG --title "${T}" \ - --msgbox "$(TEXT "Checksum do not match!")" 0 0 + --msgbox "${MSG}" 0 0 fi return 1 fi # Check conditions - if [ -f "${TMP_PATH}/update-check.sh" ]; then - chmod +x "${TMP_PATH}/update-check.sh" - ${TMP_PATH}/update-check.sh + if [ -f "${TMP_PATH}/update/update-check.sh" ]; then + chmod +x "${TMP_PATH}/update/update-check.sh" + ${TMP_PATH}/update/update-check.sh if [ $? -ne 0 ]; then + MSG="$(TEXT "The current version does not support upgrading to the latest update.zip. Please remake the bootloader disk!")" if [ "${2}" = "-1" ]; then - echo "${T} - $(TEXT "The current version does not support upgrading to the latest update.zip. Please remake the bootloader disk!")" + echo "${T} - ${MSG}" else DIALOG --title "${T}" \ - --msgbox "$(TEXT "The current version does not support upgrading to the latest update.zip. Please remake the bootloader disk!")" 0 0 + --msgbox "${MSG}" 0 0 fi return 1 fi fi + MSG="$(TEXT "Installing new files ...")" if [ "${2}" = "-1" ]; then - echo "${T} - $(TEXT "Installing new files ...")" + echo "${T} - ${MSG}" else DIALOG --title "${T}" \ - --infobox "$(TEXT "Installing new files ...")" 0 0 + --infobox "${MSG}" 0 0 fi # Process update-list.yml while read F; do [ -f "${F}" ] && rm -f "${F}" [ -d "${F}" ] && rm -Rf "${F}" - done < <(readConfigArray "remove" "${TMP_PATH}/update-list.yml") + done < <(readConfigArray "remove" "${TMP_PATH}/update/update-list.yml") while IFS=': ' read KEY VALUE; do if [ "${KEY: -1}" = "/" ]; then rm -Rf "${VALUE}" mkdir -p "${VALUE}" - tar -zxf "${TMP_PATH}/$(basename "${KEY}").tgz" -C "${VALUE}" + tar -zxf "${TMP_PATH}/update/$(basename "${KEY}").tgz" -C "${VALUE}" if [ "$(realpath "${VALUE}")" = "$(realpath "${MODULES_PATH}")" ]; then - PLATFORM="$(readModelKey "${MODEL}" "platform")" - KVER="$(readModelKey "${MODEL}" "productvers.[${PRODUCTVER}].kver")" - KPRE="$(readModelKey "${MODEL}" "productvers.[${PRODUCTVER}].kpre")" - if [ -n "${PLATFORM}" -a -n "${KVER}" ]; then - writeConfigKey "modules" "{}" "${USER_CONFIG_FILE}" - while read ID DESC; do - writeConfigKey "modules.\"${ID}\"" "" "${USER_CONFIG_FILE}" - done < <(getAllModules "${PLATFORM}" "$([ -n "${KPRE}" ] && echo "${KPRE}-")${KVER}") + if [ -n "${MODEL}" -a -n "${PRODUCTVER}" ]; then + PLATFORM="$(readModelKey "${MODEL}" "platform")" + KVER="$(readModelKey "${MODEL}" "productvers.[${PRODUCTVER}].kver")" + KPRE="$(readModelKey "${MODEL}" "productvers.[${PRODUCTVER}].kpre")" + if [ -n "${PLATFORM}" -a -n "${KVER}" ]; then + writeConfigKey "modules" "{}" "${USER_CONFIG_FILE}" + while read ID DESC; do + writeConfigKey "modules.\"${ID}\"" "" "${USER_CONFIG_FILE}" + done < <(getAllModules "${PLATFORM}" "$([ -n "${KPRE}" ] && echo "${KPRE}-")${KVER}") + fi fi fi else mkdir -p "$(dirname "${VALUE}")" - mv -f "${TMP_PATH}/$(basename "${KEY}")" "${VALUE}" + mv -f "${TMP_PATH}/update/$(basename "${KEY}")" "${VALUE}" fi - done < <(readConfigMap "replace" "${TMP_PATH}/update-list.yml") + done < <(readConfigMap "replace" "${TMP_PATH}/update/update-list.yml") touch ${PART1_PATH}/.build + MSG="$(printf "$(TEXT "%s updated with success!")" "$(TEXT "RR")")\n$(TEXT "Reboot?")" if [ "${2}" = "-1" ]; then - echo "${T} - $(printf "$(TEXT "RR updated with success to %s!\nReboot?")" "${TAG}")" + echo "${T} - ${MSG}" else DIALOG --title "${T}" \ - --msgbox "$(printf "$(TEXT "RR updated with success to %s!\nReboot?")" "${TAG}")" 0 0 + --msgbox "${MSG}" 0 0 rebootTo config fi } -# 1 - ext name +# 1 - update file # 2 - silent -function updateExts() { - T="$(printf "$(TEXT "Update %s")" "${1}")" +function updateAddons() { + T="$(printf "$(TEXT "Update %s")" "$(TEXT "Addons")")" + MSG="$(TEXT "Extracting update file ...")" if [ "${2}" = "-1" ]; then - echo "${T} - $(TEXT "Extracting last version")" + echo "${T} - ${MSG}" else DIALOG --title "${T}" \ - --infobox "$(TEXT "Extracting last version")" 0 0 + --infobox "${MSG}" 0 0 fi - if [ "${1}" = "addons" ]; then - rm -rf "${TMP_PATH}/addons" - mkdir -p "${TMP_PATH}/addons" - unzip "${TMP_PATH}/addons.zip" -d "${TMP_PATH}/addons" >/dev/null 2>&1 + rm -rf "${TMP_PATH}/update" + mkdir -p "${TMP_PATH}/update" + unzip -oq "${1}" -d "${TMP_PATH}/update" + if [ $? -ne 0 ]; then + MSG="$(TEXT "Error extracting update file.")" if [ "${2}" = "-1" ]; then - echo "${T} - $(printf "$(TEXT "Installing new %s ...")" "${1}")" + echo "${T} - ${MSG}" else DIALOG --title "${T}" \ - --infobox "$(printf "$(TEXT "Installing new %s ...")" "${1}")" 0 0 + --msgbox "${MSG}" 0 0 fi - rm -Rf "${ADDONS_PATH}/"* - [ -f "${TMP_PATH}/addons/VERSION" ] && cp -f "${TMP_PATH}/addons/VERSION" "${ADDONS_PATH}/" - for PKG in $(ls ${TMP_PATH}/addons/*.addon 2>/dev/null); do - ADDON=$(basename ${PKG} | sed 's|.addon||') - rm -rf "${ADDONS_PATH}/${ADDON}" - mkdir -p "${ADDONS_PATH}/${ADDON}" - tar -xaf "${PKG}" -C "${ADDONS_PATH}/${ADDON}" >/dev/null 2>&1 - done - elif [ "${1}" = "modules" ]; then - rm -rf "${MODULES_PATH}/"* - unzip ${TMP_PATH}/modules.zip -d "${MODULES_PATH}" >/dev/null 2>&1 - # Rebuild modules if model/buildnumber is selected + return 1 + fi + rm -Rf "${ADDONS_PATH}/"* + [ -f "${TMP_PATH}/update/VERSION" ] && cp -f "${TMP_PATH}/update/VERSION" "${ADDONS_PATH}/" + for PKG in $(ls ${TMP_PATH}/update/*.addon 2>/dev/null); do + ADDON=$(basename ${PKG} | sed 's|.addon||') + rm -rf "${ADDONS_PATH}/${ADDON}" + mkdir -p "${ADDONS_PATH}/${ADDON}" + tar -xaf "${PKG}" -C "${ADDONS_PATH}/${ADDON}" >/dev/null 2>&1 + done + touch ${PART1_PATH}/.build + MSG="$(printf "$(TEXT "%s updated with success!")" "$(TEXT "Addons")")" + if [ "${2}" = "-1" ]; then + echo "${T} - ${MSG}" + elif [ "${2}" = "0" ]; then + DIALOG --title "${T}" \ + --msgbox "${MSG}" 0 0 + else + DIALOG --title "${T}" \ + --infobox "${MSG}" 0 0 + fi +} + +# 1 - update file +# 2 - silent +function updateModules() { + T="$(printf "$(TEXT "Update %s")" "$(TEXT "Modules")")" + MSG="$(TEXT "Extracting update file ...")" + if [ "${2}" = "-1" ]; then + echo "${T} - ${MSG}" + else + DIALOG --title "${T}" \ + --infobox "${MSG}" 0 0 + fi + rm -rf "${TMP_PATH}/update" + mkdir -p "${TMP_PATH}/update" + unzip -oq "${1}" -d "${TMP_PATH}/update" + if [ $? -ne 0 ]; then + MSG="$(TEXT "Error extracting update file.")" + if [ "${2}" = "-1" ]; then + echo "${T} - ${MSG}" + else + DIALOG --title "${T}" \ + --msgbox "${MSG}" 0 0 + fi + return 1 + fi + rm -rf "${MODULES_PATH}/"* + cp -rf "${TMP_PATH}/update/"* "${MODULES_PATH}/" + if [ -n "${MODEL}" -a -n "${PRODUCTVER}" ]; then PLATFORM="$(readModelKey "${MODEL}" "platform")" KVER="$(readModelKey "${MODEL}" "productvers.[${PRODUCTVER}].kver")" KPRE="$(readModelKey "${MODEL}" "productvers.[${PRODUCTVER}].kpre")" @@ -2433,22 +2489,95 @@ function updateExts() { writeConfigKey "modules.\"${ID}\"" "" "${USER_CONFIG_FILE}" done < <(getAllModules "${PLATFORM}" "$([ -n "${KPRE}" ] && echo "${KPRE}-")${KVER}") fi - elif [ "${1}" = "LKMs" ]; then - rm -rf "${LKMS_PATH}/"* - unzip "${TMP_PATH}/rp-lkms.zip" -d "${LKMS_PATH}" >/dev/null 2>&1 - elif [ "${1}" = "CKs" ]; then - rm -rf "${CKS_PATH}/"* - unzip "${TMP_PATH}/rr-cks.zip" -d "${CKS_PATH}" >/dev/null 2>&1 fi touch ${PART1_PATH}/.build + MSG="$(printf "$(TEXT "%s updated with success!")" "$(TEXT "Modules")")" if [ "${2}" = "-1" ]; then - echo "${T} - $(printf "$(TEXT "%s updated with success!")" "${1}")" + echo "${T} - ${MSG}" elif [ "${2}" = "0" ]; then DIALOG --title "${T}" \ - --msgbox "$(printf "$(TEXT "%s updated with success!")" "${1}")" 0 0 + --msgbox "${MSG}" 0 0 else DIALOG --title "${T}" \ - --infobox "$(printf "$(TEXT "%s updated with success!")" "${1}")" 0 0 + --infobox "${MSG}" 0 0 + fi +} + +# 1 - update file +# 2 - silent +function updateLKMs() { + T="$(printf "$(TEXT "Update %s")" "$(TEXT "LKMs")")" + MSG="$(TEXT "Extracting update file ...")" + if [ "${2}" = "-1" ]; then + echo "${T} - ${MSG}" + else + DIALOG --title "${T}" \ + --infobox "${MSG}" 0 0 + fi + rm -rf "${TMP_PATH}/update" + mkdir -p "${TMP_PATH}/update" + unzip -oq "${1}" -d "${TMP_PATH}/update" + if [ $? -ne 0 ]; then + MSG="$(TEXT "Error extracting update file.")" + if [ "${2}" = "-1" ]; then + echo "${T} - ${MSG}" + else + DIALOG --title "${T}" \ + --msgbox "${MSG}" 0 0 + fi + return 1 + fi + rm -rf "${LKMS_PATH}/"* + cp -rf "${TMP_PATH}/update/"* "${LKMS_PATH}/" + touch ${PART1_PATH}/.build + MSG="$(printf "$(TEXT "%s updated with success!")" "$(TEXT "LKMs")")" + if [ "${2}" = "-1" ]; then + echo "${T} - ${MSG}" + elif [ "${2}" = "0" ]; then + DIALOG --title "${T}" \ + --msgbox "${MSG}" 0 0 + else + DIALOG --title "${T}" \ + --infobox "${MSG}" 0 0 + fi +} + +# 1 - update file +# 2 - silent +function updateCKs() { + T="$(printf "$(TEXT "Update %s")" "$(TEXT "CKs")")" + MSG="$(TEXT "Extracting update file ...")" + if [ "${2}" = "-1" ]; then + echo "${T} - ${MSG}" + else + DIALOG --title "${T}" \ + --infobox "${MSG}" 0 0 + fi + rm -rf "${TMP_PATH}/update" + mkdir -p "${TMP_PATH}/update" + unzip -oq "${1}" -d "${TMP_PATH}/update" + if [ $? -ne 0 ]; then + MSG="$(TEXT "Error extracting update file.")" + if [ "${2}" = "-1" ]; then + echo "${T} - ${MSG}" + else + DIALOG --title "${T}" \ + --msgbox "${MSG}" 0 0 + fi + return 1 + fi + rm -rf "${CKS_PATH}/"* + cp -rf "${TMP_PATH}/update/"* "${CKS_PATH}/" + touch ${PART1_PATH}/.build + MSG="$(printf "$(TEXT "%s updated with success!")" "$(TEXT "CKs")")" + if [ "${2}" = "-1" ]; then + echo "${T} - ${MSG}" + elif [ "${2}" = "0" ]; then + DIALOG --title "${T}" \ + --msgbox "${MSG}" 0 0 + else + DIALOG --title "${T}" \ + --infobox "${MSG}" 0 0 fi } @@ -2461,90 +2590,87 @@ function updateMenu() { CUR_LKMS_VER="$(cat "${LKMS_PATH}/VERSION" 2>/dev/null)" CUR_CKS_VER="$(cat "${CKS_PATH}/VERSION" 2>/dev/null)" rm -f "${TMP_PATH}/menu" - echo "a \"$(TEXT "Update all")\"" >>"${TMP_PATH}/menu" - echo "r \"$(TEXT "Update RR")(${CUR_RR_VER:-None})\"" >>"${TMP_PATH}/menu" - echo "d \"$(TEXT "Update addons")(${CUR_ADDONS_VER:-None})\"" >>"${TMP_PATH}/menu" - echo "m \"$(TEXT "Update modules")(${CUR_MODULES_VER:-None})\"" >>"${TMP_PATH}/menu" - echo "l \"$(TEXT "Update LKMs")(${CUR_LKMS_VER:-None})\"" >>"${TMP_PATH}/menu" - echo "c \"$(TEXT "Update CKs")(${CUR_CKS_VER:-None})\"" >>"${TMP_PATH}/menu" + echo "a \"$(TEXT "Update") $(TEXT "All")\"" >>"${TMP_PATH}/menu" + echo "r \"$(TEXT "Update") $(TEXT "RR")(${CUR_RR_VER:-None})\"" >>"${TMP_PATH}/menu" + echo "d \"$(TEXT "Update") $(TEXT "Addons")(${CUR_ADDONS_VER:-None})\"" >>"${TMP_PATH}/menu" + echo "m \"$(TEXT "Update") $(TEXT "Modules")(${CUR_MODULES_VER:-None})\"" >>"${TMP_PATH}/menu" + echo "l \"$(TEXT "Update") $(TEXT "LKMs")(${CUR_LKMS_VER:-None})\"" >>"${TMP_PATH}/menu" + echo "c \"$(TEXT "Update") $(TEXT "CKs")(${CUR_CKS_VER:-None})\"" >>"${TMP_PATH}/menu" echo "u \"$(TEXT "Local upload")\"" >>"${TMP_PATH}/menu" echo "b \"$(TEXT "Pre Release:") \Z4${PRERELEASE}\Zn\"" >>"${TMP_PATH}/menu" echo "e \"$(TEXT "Exit")\"" >>"${TMP_PATH}/menu" if [ -z "${1}" ]; then + SILENT="0" DIALOG --title "$(TEXT "Update")" \ - --menu "$(TEXT "Manually uploading update.zip,addons.zip,modules.zip,rp-lkms.zip,rr-cks.zip to /tmp/ will skip the download.")" 0 0 0 --file "${TMP_PATH}/menu" \ + --menu "$(TEXT "Manually uploading update*.zip,addons*.zip,modules*.zip,rp-lkms*.zip,rr-cks*.zip to /tmp/ will skip the download.")" 0 0 0 --file "${TMP_PATH}/menu" \ 2>${TMP_PATH}/resp [ $? -ne 0 ] && return else + SILENT="-1" echo "${1}" >"${TMP_PATH}/resp" fi case "$(<${TMP_PATH}/resp)" in a) - [ -z "${1}" ] && SILENT="1" || SILENT="-1" - T="$(printf "$(TEXT "Update %s")" "$(TEXT "addons")")" - if [ ! -f "${TMP_PATH}/addons.zip" ]; then - downloadExts "addons" "${CUR_ADDONS_VER:-None}" "https://github.com/XXXXXX/rr-addons" "addons" "${SILENT}" - fi - [ -f "${TMP_PATH}/addons.zip" ] && updateExts "addons" "${SILENT}" - T="$(printf "$(TEXT "Update %s")" "$(TEXT "modules")")" - if [ ! -f "${TMP_PATH}/modules.zip" ]; then - downloadExts "modules" "${CUR_MODULES_VER:-None}" "https://github.com/XXXXXX/rr-modules" "modules" "${SILENT}" - fi - [ -f "${TMP_PATH}/modules.zip" ] && updateExts "modules" "${SILENT}" - T="$(printf "$(TEXT "Update %s")" "$(TEXT "LKMs")")" - if [ ! -f "${TMP_PATH}/rp-lkms.zip" ]; then - downloadExts "LKMs" "${CUR_LKMS_VER:-None}" "https://github.com/XXXXXX/rr-lkms" "rp-lkms" "${SILENT}" - fi - [ -f "${TMP_PATH}/rp-lkms.zip" ] && updateExts "LKMs" "${SILENT}" - T="$(printf "$(TEXT "Update %s")" "$(TEXT "CKs")")" - if [ ! -f "${TMP_PATH}/rp-cks.zip" ]; then - downloadExts "CKs" "${CUR_CKS_VER:-None}" "https://github.com/XXXXXX/rr-cks" "rr-cks" "${SILENT}" - fi - [ -f "${TMP_PATH}/rr-cks.zip" ] && updateExts "CKs" "${SILENT}" - - [ -z "${1}" ] && SILENT="0" || SILENT="-1" - T="$(printf "$(TEXT "Update %s")" "$(TEXT "RR")")" - if [ ! -f "${TMP_PATH}/update.zip" ]; then - downloadExts "RR" "${CUR_RR_VER:-None}" "https://github.com/XXXXXX/rr" "update" "${SILENT}" - fi - [ -f "${TMP_PATH}/update.zip" ] && updateRR "RR" "${SILENT}" + F="$(ls ${TMP_PATH}/updateall*.zip 2>/dev/null | sort -V | tail -n 1)" + [ -z "${F}" ] && downloadExts "$(TEXT "All")" "${CUR_RR_VER:-None}" "https://github.com/RROrg/rr" "updateall" "${SILENT}" + F="$(ls ${TMP_PATH}/updateall*.zip 2>/dev/null | sort -V | tail -n 1)" + [ -n "${F}" ] && updateRR "${F}" "${SILENT}" ;; r) - [ -z "${1}" ] && SILENT="0" || SILENT="-1" - T="$(printf "$(TEXT "Update %s")" "$(TEXT "RR")")" - [ -f "${TMP_PATH}/update.zip" ] || downloadExts "RR" "${CUR_RR_VER:-None}" "https://github.com/XXXXXX/rr" "update" "${SILENT}" - [ -f "${TMP_PATH}/update.zip" ] && updateRR "RR" "${SILENT}" + F="$(ls ${TMP_PATH}/update*.zip 2>/dev/null | sort -V | tail -n 1)" + [ -z "${F}" ] && downloadExts "$(TEXT "RR")" "${CUR_RR_VER:-None}" "https://github.com/RROrg/rr" "update" "${SILENT}" + F="$(ls ${TMP_PATH}/update*.zip 2>/dev/null | sort -V | tail -n 1)" + [ -n "${F}" ] && updateRR "${F}" "${SILENT}" ;; d) - [ -z "${1}" ] && SILENT="0" || SILENT="-1" - T="$(printf "$(TEXT "Update %s")" "$(TEXT "addons")")" - [ -f "${TMP_PATH}/addons.zip" ] || downloadExts "addons" "${CUR_ADDONS_VER:-None}" "https://github.com/XXXXXX/rr-addons" "addons" "${SILENT}" - [ -f "${TMP_PATH}/addons.zip" ] && updateExts "addons" "${SILENT}" + if [ -z "${DEBUG}" ]; then + DIALOG --title "$(TEXT "Update")" \ + --msgbox "$(printf "$(TEXT "No longer supports update %s separately. Please choose to update All/RR")" "$(TEXT "Addons")")" 0 0 + continue + fi + F="$(ls ${TMP_PATH}/addons*.zip 2>/dev/null | sort -V | tail -n 1)" + [ -z "${F}" ] && downloadExts "$(TEXT "Addons")" "${CUR_ADDONS_VER:-None}" "https://github.com/RROrg/rr-addons" "addons" "${SILENT}" + F="$(ls ${TMP_PATH}/addons*.zip 2>/dev/null | sort -V | tail -n 1)" + [ -n "${F}" ] && updateAddons "${F}" "${SILENT}" ;; m) - [ -z "${1}" ] && SILENT="0" || SILENT="-1" - T="$(printf "$(TEXT "Update %s")" "$(TEXT "modules")")" - [ -f "${TMP_PATH}/modules.zip" ] || downloadExts "modules" "${CUR_MODULES_VER:-None}" "https://github.com/XXXXXX/rr-modules" "modules" "${SILENT}" - [ -f "${TMP_PATH}/modules.zip" ] && updateExts "modules" "${SILENT}" + if [ -z "${DEBUG}" ]; then + DIALOG --title "$(TEXT "Update")" \ + --msgbox "$(printf "$(TEXT "No longer supports update %s separately. Please choose to update All/RR")" "$(TEXT "Modules")")" 0 0 + continue + fi + F="$(ls ${TMP_PATH}/modules*.zip 2>/dev/null | sort -V | tail -n 1)" + [ -z "${F}" ] && downloadExts "$(TEXT "Modules")" "${CUR_MODULES_VER:-None}" "https://github.com/RROrg/rr-modules" "modules" "${SILENT}" + F="$(ls ${TMP_PATH}/modules*.zip 2>/dev/null | sort -V | tail -n 1)" + [ -n "${F}" ] && updateModules "${F}" "${SILENT}" ;; l) - [ -z "${1}" ] && SILENT="0" || SILENT="-1" - T="$(printf "$(TEXT "Update %s")" "$(TEXT "LKMs")")" - [ -f "${TMP_PATH}/rp-lkms.zip" ] || downloadExts "LKMs" "${CUR_LKMS_VER:-None}" "https://github.com/XXXXXX/rr-lkms" "rp-lkms" "${SILENT}" - [ -f "${TMP_PATH}/rp-lkms.zip" ] && updateExts "LKMs" "${SILENT}" + if [ -z "${DEBUG}" ]; then + DIALOG --title "$(TEXT "Update")" \ + --msgbox "$(printf "$(TEXT "No longer supports update %s separately. Please choose to update All/RR")" "$(TEXT "LKMs")")" 0 0 + continue + fi + F="$(ls ${TMP_PATH}/rp-lkms*.zip 2>/dev/null | sort -V | tail -n 1)" + [ -z "${F}" ] && downloadExts "$(TEXT "LKMs")" "${CUR_LKMS_VER:-None}" "https://github.com/RROrg/rr-lkms" "rp-lkms" "${SILENT}" + F="$(ls ${TMP_PATH}/rp-lkms*.zip 2>/dev/null | sort -V | tail -n 1)" + [ -n "${F}" ] && updateLKMs "${F}" "${SILENT}" ;; c) - [ -z "${1}" ] && SILENT="0" || SILENT="-1" - T="$(printf "$(TEXT "Update %s")" "$(TEXT "CKs")")" - [ -f "${TMP_PATH}/rr-cks.zip" ] || downloadExts "CKs" "${CUR_CKS_VER:-None}" "https://github.com/XXXXXX/rr-cks" "rr-cks" "${SILENT}" - - [ -f "${TMP_PATH}/rr-cks.zip" ] && updateExts "CKs" "${SILENT}" + if [ -z "${DEBUG}" ]; then + DIALOG --title "$(TEXT "Update")" \ + --msgbox "$(printf "$(TEXT "No longer supports update %s separately. Please choose to update All/RR")" "$(TEXT "CKs")")" 0 0 + continue + fi + F="$(ls ${TMP_PATH}/rr-cks*.zip 2>/dev/null | sort -V | tail -n 1)" + [ -z "${F}" ] && downloadExts "$(TEXT "CKs")" "${CUR_CKS_VER:-None}" "https://github.com/RROrg/rr-cks" "rr-cks" "${SILENT}" + F="$(ls ${TMP_PATH}/rr-cks*.zip 2>/dev/null | sort -V | tail -n 1)" + [ -n "${F}" ] && updateCKs "${F}" "${SILENT}" ;; u) if ! tty | grep -q "/dev/pts" || [ -z "${SSH_TTY}" ]; then MSG="" MSG+="$(TEXT "This feature is only available when accessed via ssh (Requires a terminal that supports ZModem protocol).\n")" - MSG+="$(TEXT "Or upload update.zip, addons.zip, modules.zip, rp-lkms.zip,rr-cks.zip to /tmp/ via DUFS will skip the download.\n")" + MSG+="$(TEXT "Manually uploading update*.zip,addons*.zip,modules*.zip,rp-lkms*.zip,rr-cks*.zip to /tmp/ will skip the download.")" DIALOG --title "$(TEXT "Update")" \ --msgbox "${MSG}" 0 0 return @@ -2576,31 +2702,26 @@ function updateMenu() { DIALOG --title "$(TEXT "Update")" \ --msgbox "$(TEXT "Not a valid file, please try again!")" 0 0 else - [ -z "${1}" ] && SILENT="0" || SILENT="-1" if [[ "${USER_FILE}" = update*.zip ]]; then - rm -f "${TMP_PATH}/update.zip" - mv -f "${TMP_UP_PATH}/${USER_FILE}" "${TMP_PATH}/update.zip" - updateRR "RR" "${SILENT}" + rm -f ${TMP_PATH}/update*.zip + updateRR "${USER_FILE}" "${SILENT}" elif [[ "${USER_FILE}" = addons*.zip ]]; then - rm -f "${TMP_PATH}/addons.zip" - mv -f "${TMP_UP_PATH}/${USER_FILE}" "${TMP_PATH}/addons.zip" - updateExts "addons" "${SILENT}" + rm -f ${TMP_PATH}/addons*.zip + updateAddons "${USER_FILE}" "${SILENT}" elif [[ "${USER_FILE}" = modules*.zip ]]; then - rm -f "${TMP_PATH}/modules.zip" - mv -f "${TMP_UP_PATH}/${USER_FILE}" "${TMP_PATH}/modules.zip" - updateExts "modules" "${SILENT}" + rm -f ${TMP_PATH}/modules*.zip + updateModules "${USER_FILE}" "${SILENT}" elif [[ "${USER_FILE}" = rp-lkms*.zip ]]; then - rm -f "${TMP_PATH}/rp-lkms.zip" - mv -f "${TMP_UP_PATH}/${USER_FILE}" "${TMP_PATH}/rp-lkms.zip" - updateExts "LKMs" "${SILENT}" + rm -f ${TMP_PATH}/rp-lkms*.zip + updateLKMs "${USER_FILE}" "${SILENT}" elif [[ "${USER_FILE}" = rr-cks*.zip ]]; then - rm -f "${TMP_PATH}/rr-cks.zip" - mv -f "${TMP_UP_PATH}/${USER_FILE}" "${TMP_PATH}/rr-cks.zip" - updateExts "CKs" "${SILENT}" + rm -f ${TMP_PATH}/rr-cks*.zip + updateCKs "${USER_FILE}" "${SILENT}" else DIALOG --title "$(TEXT "Update")" \ --msgbox "$(TEXT "Not a valid file, please try again!")" 0 0 fi + rm -f "${USER_FILE}" fi ;; b) diff --git a/scripts/func.sh b/scripts/func.sh index c1b8b24c..f4539a5b 100755 --- a/scripts/func.sh +++ b/scripts/func.sh @@ -67,30 +67,35 @@ function getExtractor() { } # Get latest Buildroot -# $1 TAG -# $2 path +# $1 path +# $2 (true|false[d]) include prerelease function getBuildroot() { echo "Getting Buildroot begin" local DEST_PATH="${1:-buildroot}" - rm -rf "${DEST_PATH}" - mkdir -p "${DEST_PATH}" - if [ "${1}" = "latest" ]; then + local CACHE_DIR="/tmp/buildroot" + local CACHE_FILE="/tmp/buildroot.zip" + rm -f "${CACHE_FILE}" + if [ "${2}" = "true" ]; then TAG=$(curl -skL -H "Authorization: token ${TOKEN}" "https://api.github.com/repos/RROrg/rr-buildroot/releases" | jq -r ".[0].tag_name") else TAG=$(curl -skL -H "Authorization: token ${TOKEN}" "https://api.github.com/repos/RROrg/rr-buildroot/releases/latest" | jq -r ".tag_name") fi while read ID NAME; do - if [ "${NAME}" = "bzImage" ]; then - STATUS=$(curl -kL -w "%{http_code}" -H "Authorization: token ${TOKEN}" -H "Accept: application/octet-stream" "https://api.github.com/repos/RROrg/rr-buildroot/releases/assets/${ID}" -o "${DEST_PATH}/bzImage-rr") - echo "TAG=${TAG}; Status=${STATUS}" - [ ${STATUS:-0} -ne 200 ] && exit 1 - elif [ "${NAME}" = "rootfs.cpio.xz" ]; then - STATUS=$(curl -kL -w "%{http_code}" -H "Authorization: token ${TOKEN}" -H "Accept: application/octet-stream" "https://api.github.com/repos/RROrg/rr-buildroot/releases/assets/${ID}" -o "${DEST_PATH}/initrd-rr") + if [ "${NAME}" = "buildroot-${TAG}.zip" ]; then + STATUS=$(curl -kL -w "%{http_code}" -H "Authorization: token ${TOKEN}" -H "Accept: application/octet-stream" "https://api.github.com/repos/RROrg/rr-buildroot/releases/assets/${ID}" -o "${CACHE_FILE}") echo "TAG=${TAG}; Status=${STATUS}" [ ${STATUS:-0} -ne 200 ] && exit 1 fi done < <(curl -skL -H "Authorization: Bearer ${TOKEN}" "https://api.github.com/repos/RROrg/rr-buildroot/releases/tags/${TAG}" | jq -r '.assets[] | "\(.id) \(.name)"') - + # Unzip Buildroot + rm -rf "${CACHE_DIR}" + mkdir -p "${CACHE_DIR}" + unzip "${CACHE_FILE}" -d "${CACHE_DIR}" + mkdir -p "${DEST_PATH}" + mv -f "${CACHE_DIR}/bzImage-rr" "${DEST_PATH}" + mv -f "${CACHE_DIR}/initrd-rr" "${DEST_PATH}" + rm -rf "${CACHE_DIR}" + rm -f "${CACHE_FILE}" echo "Getting Buildroot end" } @@ -108,7 +113,7 @@ function getCKs() { TAG=$(curl -skL -H "Authorization: token ${TOKEN}" "https://api.github.com/repos/RROrg/rr-cks/releases/latest" | jq -r ".tag_name") fi while read ID NAME; do - if [ "${NAME}" = "rr-cks.zip" ]; then + if [ "${NAME}" = "rr-cks-${TAG}.zip" ]; then STATUS=$(curl -kL -w "%{http_code}" -H "Authorization: token ${TOKEN}" -H "Accept: application/octet-stream" "https://api.github.com/repos/RROrg/rr-cks/releases/assets/${ID}" -o "${CACHE_FILE}") echo "TAG=${TAG}; Status=${STATUS}" [ ${STATUS:-0} -ne 200 ] && exit 1 @@ -137,7 +142,7 @@ function getLKMs() { TAG=$(curl -skL -H "Authorization: token ${TOKEN}" "https://api.github.com/repos/RROrg/rr-lkms/releases/latest" | jq -r ".tag_name") fi while read ID NAME; do - if [ "${NAME}" = "rp-lkms.zip" ]; then + if [ "${NAME}" = "rp-lkms-${TAG}.zip" ]; then STATUS=$(curl -kL -w "%{http_code}" -H "Authorization: token ${TOKEN}" -H "Accept: application/octet-stream" "https://api.github.com/repos/RROrg/rr-lkms/releases/assets/${ID}" -o "${CACHE_FILE}") echo "TAG=${TAG}; Status=${STATUS}" [ ${STATUS:-0} -ne 200 ] && exit 1 @@ -166,7 +171,7 @@ function getAddons() { TAG=$(curl -skL -H "Authorization: token ${TOKEN}" "https://api.github.com/repos/RROrg/rr-addons/releases/latest" | jq -r ".tag_name") fi while read ID NAME; do - if [ "${NAME}" = "addons.zip" ]; then + if [ "${NAME}" = "addons-${TAG}.zip" ]; then STATUS=$(curl -kL -w "%{http_code}" -H "Authorization: token ${TOKEN}" -H "Accept: application/octet-stream" "https://api.github.com/repos/RROrg/rr-addons/releases/assets/${ID}" -o "${CACHE_FILE}") echo "TAG=${TAG}; Status=${STATUS}" [ ${STATUS:-0} -ne 200 ] && exit 1 @@ -187,6 +192,8 @@ function getAddons() { echo "Extracting ${PKG} to ${DEST_PATH}/${ADDON}" tar -xaf "${PKG}" -C "${DEST_PATH}/${ADDON}" done + rm -rf "${CACHE_DIR}" + rm -f "${CACHE_FILE}" echo "Getting Addons end" } @@ -204,7 +211,7 @@ function getModules() { TAG=$(curl -skL -H "Authorization: token ${TOKEN}" "https://api.github.com/repos/RROrg/rr-modules/releases/latest" | jq -r ".tag_name") fi while read ID NAME; do - if [ "${NAME}" = "modules.zip" ]; then + if [ "${NAME}" = "modules-${TAG}.zip" ]; then STATUS=$(curl -kL -w "%{http_code}" -H "Authorization: token ${TOKEN}" -H "Accept: application/octet-stream" "https://api.github.com/repos/RROrg/rr-modules/releases/assets/${ID}" -o "${CACHE_FILE}") echo "TAG=${TAG}; Status=${STATUS}" [ ${STATUS:-0} -ne 200 ] && exit 1