From 0d5aab10e8dd270b00600f398848eee96178b08e Mon Sep 17 00:00:00 2001 From: Ing Date: Thu, 13 Jul 2023 00:51:10 +0800 Subject: [PATCH] add update all, fix typo --- .../arpl/overlayfs/opt/arpl/lang/arpl.pot | 137 +++++++++-------- .../arpl/overlayfs/opt/arpl/lang/zh_CN.mo | Bin 20862 -> 20951 bytes .../arpl/overlayfs/opt/arpl/lang/zh_CN.po | 139 ++++++++++-------- files/board/arpl/overlayfs/opt/arpl/menu.sh | 98 ++++++++---- 4 files changed, 218 insertions(+), 156 deletions(-) diff --git a/files/board/arpl/overlayfs/opt/arpl/lang/arpl.pot b/files/board/arpl/overlayfs/opt/arpl/lang/arpl.pot index 0c692887..b1f7ca5e 100644 --- a/files/board/arpl/overlayfs/opt/arpl/lang/arpl.pot +++ b/files/board/arpl/overlayfs/opt/arpl/lang/arpl.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-07-11 21:15+0800\n" +"POT-Creation-Date: 2023-07-12 23:47+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -223,7 +223,7 @@ msgstr "" msgid "Choose the model" msgstr "" -#: menu.sh:154 menu.sh:1765 +#: menu.sh:154 menu.sh:1808 msgid "Choose a product version" msgstr "" @@ -251,7 +251,7 @@ msgstr "" msgid "Reconfiguring Synoinfo, Addons and Modules" msgstr "" -#: menu.sh:260 menu.sh:405 menu.sh:546 menu.sh:687 menu.sh:1633 +#: menu.sh:260 menu.sh:405 menu.sh:546 menu.sh:687 menu.sh:1655 msgid "Choose a option" msgstr "" @@ -275,14 +275,14 @@ msgstr "" msgid "Upload a external addon" msgstr "" -#: menu.sh:266 menu.sh:412 menu.sh:542 menu.sh:682 menu.sh:995 menu.sh:1640 -#: menu.sh:1788 menu.sh:1856 +#: menu.sh:266 menu.sh:412 menu.sh:542 menu.sh:682 menu.sh:995 menu.sh:1663 +#: menu.sh:1831 menu.sh:1899 msgid "Exit" msgstr "" #: menu.sh:278 menu.sh:283 menu.sh:289 menu.sh:300 menu.sh:308 menu.sh:326 #: menu.sh:340 menu.sh:345 menu.sh:349 menu.sh:363 menu.sh:367 menu.sh:374 -#: menu.sh:377 menu.sh:1767 +#: menu.sh:377 menu.sh:1810 msgid "Addons" msgstr "" @@ -306,7 +306,7 @@ msgstr "" msgid "Select addon to remove" msgstr "" -#: menu.sh:346 menu.sh:1236 menu.sh:1267 menu.sh:1300 menu.sh:1702 +#: menu.sh:346 menu.sh:1236 menu.sh:1267 menu.sh:1300 menu.sh:1745 msgid "This feature is only available when accessed via web/ssh." msgstr "" @@ -314,7 +314,7 @@ msgstr "" msgid "Please upload the *.addons file." msgstr "" -#: menu.sh:364 menu.sh:517 menu.sh:1729 menu.sh:1743 +#: menu.sh:364 menu.sh:517 menu.sh:1772 menu.sh:1786 msgid "Not a valid file, please try again!" msgstr "" @@ -331,7 +331,7 @@ msgid "File format not recognized!" msgstr "" #: menu.sh:393 menu.sh:421 menu.sh:425 menu.sh:442 menu.sh:455 menu.sh:469 -#: menu.sh:475 menu.sh:494 menu.sh:497 menu.sh:512 menu.sh:516 menu.sh:1768 +#: menu.sh:475 menu.sh:494 menu.sh:497 menu.sh:512 menu.sh:516 menu.sh:1811 msgid "Modules" msgstr "" @@ -608,7 +608,7 @@ msgstr "" msgid "Addon %s not found!" msgstr "" -#: menu.sh:953 menu.sh:1839 +#: menu.sh:953 menu.sh:1882 msgid "Cleaning" msgstr "" @@ -691,7 +691,7 @@ msgstr "" msgid "Advanced" msgstr "" -#: menu.sh:998 menu.sh:1791 +#: menu.sh:998 menu.sh:1834 msgid "Choose the option" msgstr "" @@ -899,7 +899,7 @@ msgstr "" msgid "Config changed, would you like to rebuild the loader?" msgstr "" -#: menu.sh:1461 menu.sh:1782 +#: menu.sh:1461 menu.sh:1825 msgid "Choose a language" msgstr "" @@ -911,196 +911,205 @@ msgstr "" msgid "Choice a keymap" msgstr "" -#: menu.sh:1505 menu.sh:1538 menu.sh:1588 menu.sh:1645 menu.sh:1653 -#: menu.sh:1661 menu.sh:1669 +#: menu.sh:1506 menu.sh:1554 menu.sh:1605 menu.sh:1668 menu.sh:1672 +#: menu.sh:1676 menu.sh:1680 menu.sh:1688 menu.sh:1696 menu.sh:1704 +#: menu.sh:1712 msgid "Update %s" msgstr "" -#: menu.sh:1508 +#: menu.sh:1509 msgid "Checking last version" msgstr "" -#: menu.sh:1516 +#: menu.sh:1518 menu.sh:1521 msgid "Error checking new version" msgstr "" -#: menu.sh:1521 +#: menu.sh:1528 +msgid "No new version." +msgstr "" + +#: menu.sh:1531 msgid "No new version. Actual version is %s\\nForce update?" msgstr "" -#: menu.sh:1525 +#: menu.sh:1536 msgid "Downloading last version" msgstr "" -#: menu.sh:1530 +#: menu.sh:1542 menu.sh:1545 msgid "Error downloading new version" msgstr "" -#: menu.sh:1540 menu.sh:1590 +#: menu.sh:1556 menu.sh:1607 msgid "Extracting last version" msgstr "" -#: menu.sh:1544 +#: menu.sh:1560 msgid "Error extracting update file" msgstr "" -#: menu.sh:1551 +#: menu.sh:1567 msgid "Checksum do not match!" msgstr "" -#: menu.sh:1560 +#: menu.sh:1576 msgid "" "The current version does not support upgrading to the latest update.zip. " "Please remake the bootloader disk!" msgstr "" -#: menu.sh:1565 +#: menu.sh:1581 msgid "Installing new files" msgstr "" -#: menu.sh:1582 +#: menu.sh:1598 msgid "Arpl updated with success to %s!\\nReboot?" msgstr "" -#: menu.sh:1596 +#: menu.sh:1613 msgid "Installing new %s" msgstr "" -#: menu.sh:1624 +#: menu.sh:1642 menu.sh:1645 msgid "%s updated with success!" msgstr "" -#: menu.sh:1634 +#: menu.sh:1656 +msgid "Update all" +msgstr "" + +#: menu.sh:1657 msgid "Update arpl" msgstr "" -#: menu.sh:1635 +#: menu.sh:1658 msgid "Update addons" msgstr "" -#: menu.sh:1636 +#: menu.sh:1659 msgid "Update modules" msgstr "" -#: menu.sh:1637 +#: menu.sh:1660 msgid "Update LKMs" msgstr "" -#: menu.sh:1638 +#: menu.sh:1661 msgid "Set proxy server" msgstr "" -#: menu.sh:1639 +#: menu.sh:1662 msgid "Local upload" msgstr "" -#: menu.sh:1645 -msgid "arpl" -msgstr "" - -#: menu.sh:1653 +#: menu.sh:1668 menu.sh:1696 msgid "addons" msgstr "" -#: menu.sh:1661 +#: menu.sh:1672 menu.sh:1704 msgid "modules" msgstr "" -#: menu.sh:1669 +#: menu.sh:1676 menu.sh:1712 msgid "LKMs" msgstr "" -#: menu.sh:1679 menu.sh:1690 menu.sh:1701 menu.sh:1711 menu.sh:1728 -#: menu.sh:1742 +#: menu.sh:1680 menu.sh:1688 +msgid "arpl" +msgstr "" + +#: menu.sh:1722 menu.sh:1733 menu.sh:1744 menu.sh:1754 menu.sh:1771 +#: menu.sh:1785 msgid "Update" msgstr "" -#: menu.sh:1680 +#: menu.sh:1723 msgid "Please enter a proxy server url" msgstr "" -#: menu.sh:1691 +#: menu.sh:1734 msgid "Invalid proxy server url, continue?" msgstr "" -#: menu.sh:1706 +#: menu.sh:1749 msgid "" "Please keep the attachment name consistent with the attachment name on " "Github.\\n" msgstr "" -#: menu.sh:1707 +#: menu.sh:1750 msgid "Upload update.zip will update arpl.\\n" msgstr "" -#: menu.sh:1708 +#: menu.sh:1751 msgid "Upload addons.zip will update Addons.\\n" msgstr "" -#: menu.sh:1709 +#: menu.sh:1752 msgid "Upload modules.zip will update Modules.\\n" msgstr "" -#: menu.sh:1710 +#: menu.sh:1753 msgid "Upload rp-lkms.zip will update LKMs.\\n" msgstr "" -#: menu.sh:1763 +#: menu.sh:1806 msgid "Choose a model" msgstr "" -#: menu.sh:1769 +#: menu.sh:1812 msgid "Cmdline menu" msgstr "" -#: menu.sh:1770 +#: menu.sh:1813 msgid "Synoinfo menu" msgstr "" -#: menu.sh:1773 +#: menu.sh:1816 msgid "Advanced menu" msgstr "" -#: menu.sh:1776 +#: menu.sh:1819 msgid "Build the loader" msgstr "" -#: menu.sh:1780 +#: menu.sh:1823 msgid "Boot the loader" msgstr "" -#: menu.sh:1783 +#: menu.sh:1826 msgid "Choose a keymap" msgstr "" -#: menu.sh:1785 +#: menu.sh:1828 msgid "Clean disk cache" msgstr "" -#: menu.sh:1787 +#: menu.sh:1830 msgid "Update menu" msgstr "" -#: menu.sh:1851 +#: menu.sh:1894 msgid "Choose a action" msgstr "" -#: menu.sh:1852 +#: menu.sh:1895 msgid "Poweroff" msgstr "" -#: menu.sh:1853 +#: menu.sh:1896 msgid "Reboot" msgstr "" -#: menu.sh:1854 +#: menu.sh:1897 msgid "Reboot to arpl" msgstr "" -#: menu.sh:1855 +#: menu.sh:1898 msgid "Back to shell" msgstr "" -#: menu.sh:1881 +#: menu.sh:1924 msgid "Call \\033[1;32mmenu.sh\\033[0m to return to menu" msgstr "" diff --git a/files/board/arpl/overlayfs/opt/arpl/lang/zh_CN.mo b/files/board/arpl/overlayfs/opt/arpl/lang/zh_CN.mo index 16f9f0ed3d98db4f49e244a520cef829da4c5e4b..4f07046ff865d203409e4061c39ebb1922edb900 100644 GIT binary patch delta 5334 zcmXxo33yId9>?($lSCqmEFzIuB1A0FNMc_?Vrv>PN+?y;(OB|`SZ4BcF!7=>ty%_e z7-OlX+A5(+MA4!KWi&dWt*z8DCYTPL5?X8L`+M(kAOH7r&biAu=YP(G%}%b13k=x5AG%H2cMYRrcb#?--$7==498joWqypDq~w!SeLI28kN2S(xn z)O}|$9B*SE^yQ?lF)ouufj-S(48oDV=p@|7HV)U>Z)N9$1ZWcn3qVegk8eq-kkQLndKzP#sRR&a^H- z-M8A-x1gTC*VZeMN1O8)M*rq6g~sSdUMZRc)X39O4;pOixu{GPq8>O46L1mM#tPH~ z_M$Ry40YYN*a5F1Nixwf&cIX9rM1hTFdf~ffdr9vZ%jn3Su%!UU*wM&Zrck{nV65t z#5=bBF{+~@SPw7SdJPVz9?1GJ7BjXH`PU3*)1a9zLv^$nm7@Kq8Jw~8YuJUlMyY{z z+ zjK$xh*0uz7V<~D=eu^5{348t$YPa7+WunH`AD}Yg#m?4VX^5J*t2qUoNI|V(Hm2ez zRO*(ZmSQWaY8Uv-p( z+Kky4i*KXWY(GxH^QhgQ9q$Zu7%D^KP#qN6_Jybntg)`Q=Qp7;yBk~M8BEms|C<(0 zYTKdKss}0~nWz-y+V*Lv2h2jP{aVxjPNFvL4O9jnp)wXodbC9GsEl+&W^9Jq_Ck!J zf3tvsHphFYO;drI(J|BwXHgHhkGd|rrL#GkqdMqi9fnGAKI*z+)Bu;GUgOQy&(V+i zH|Wv~FHoqBKVV0^gA=he-(7uLSKwm2f_-o*`I9@b6F$T)nA%1QYRn`Yf;VviK&dcGg1CCkPrd+&3F`hxW}%5DpfZ+>8hGb4@~^@`8gxUh zy`TtnV=-zbC8&{?B7e*-el*jcu{nnJbgu7++AIA~nR)>|ONRN>SK0HmdpXxfxhSZE zmevla8#7QT%14d381)`6Ky|nTHJ}P?h?S@{y@48d4QffedFS-}2G$m+=cQU*T`6ey zr(d_g_5_CijEEk*N9IS=wQG4tIWCAX; zhk{0Y0@cA~Y>Br~4~*&U%%Br?rrrmmu?Urcm6(lNQ8RmN_3q;=Q2;6f@u+@MP?^d= zU-~!M6ttOgP#GA5`ZUf#4P*oA0ad6>T|ljAH7Y~Dq6Y5Y*J+PN-JfdfBT$=n8tOUo zZ2K}v|EA0~9I{?O-Ehy={rfpL#-V1Mgc@)^jKdt%fL=r0x5T!ux9wk`_QFNmUW2+W zlD~;udSGh`nn5~hZ3d%eIu7+6n2f$S3$>Q>FcUW*-xBi^j>p7j`Bx5>pxUc21p~Oa z6{g|KH~|@hIg&~K3n&CX$3GOY2nXN;)SC9sa$e8nsE*69IUdI*c-x*2<0ievEm2FD zhT1!$P??!-U50_w%TUkRHGuqUW*2Di$E&E#aSH?SzSWn}s68BYePh)5cvLD=P#yKf zczhXKU@@wrGHixbsOxG_-;W^IKYDr5_dtohVBChQeyeaHP-MA06Cn`}h_!sKJIy_w+g`#FW z3N?c%7=mx1Hsfm4ME0Qi=p>9CqO+7s(NB|g-+ z!ImdkS0Nu2vzk~;cxi<=_-oSKAzBl=hz#N~p<|zec>}*D<`Aj24cuj6K|^;_sJ3mh ztW)q;;)<;cZKU(W1R|a2Nz5dCh)u+N!bSXp_}(29p3wFdrT2+)VheGMczV1?;RRc1 zhnL*H3lDGfh|*Qt+6p%loo)Sd_tNktu8(ak2EQWK5jnQ482@L>Pp~7ggE&I4qdlLs z&oGymO7tf#5Tl9fgpN33l&56OpK%PKci0~8qklvru&-7wyk7hs_+KgQm+ zEanl7h%#a=@fTtdF_h5%%FD+-L?!VeF_+N$_%3|Qs+HG^$X-Y}n1~{D94GueCI0Ih z&k(bT4~ZMZ2ZWBFh?7JhQA4~#EOSRhGSaUJ)&)41$HNXCbkg?#91PbxJO(h zbQ~h~dP>gEC*|`ZJ_#&OjGG)(D?h({S<*HizvPtIl+>>6JC$d3XckyLD*e>}-|G3Z OtJlmg-#y^4_x}O#_)+5k delta 5290 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 diff --git a/files/board/arpl/overlayfs/opt/arpl/lang/zh_CN.po b/files/board/arpl/overlayfs/opt/arpl/lang/zh_CN.po index 3188ad23..df66996b 100644 --- a/files/board/arpl/overlayfs/opt/arpl/lang/zh_CN.po +++ b/files/board/arpl/overlayfs/opt/arpl/lang/zh_CN.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: arpl-i18n\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-07-09 11:51+0800\n" -"PO-Revision-Date: 2023-07-09 11:51+0800\n" +"POT-Creation-Date: 2023-07-12 23:47+0800\n" +"PO-Revision-Date: 2023-07-12 23:47+0800\n" "Last-Translator: ing \n" "Language-Team: Chinese (simplified) \n" "Language: zh_CN\n" @@ -222,7 +222,7 @@ msgstr "显示测试型号" msgid "Choose the model" msgstr "选择型号" -#: menu.sh:154 menu.sh:1765 +#: menu.sh:154 menu.sh:1808 msgid "Choose a product version" msgstr "选择版本" @@ -250,7 +250,7 @@ msgstr "获取线上pat数据 .." msgid "Reconfiguring Synoinfo, Addons and Modules" msgstr "重新配置 Syninfo, 插件和模块" -#: menu.sh:260 menu.sh:405 menu.sh:546 menu.sh:687 menu.sh:1633 +#: menu.sh:260 menu.sh:405 menu.sh:546 menu.sh:687 menu.sh:1655 msgid "Choose a option" msgstr "设置" @@ -274,14 +274,14 @@ msgstr "显示所有可用插件" msgid "Upload a external addon" msgstr "上传外部插件" -#: menu.sh:266 menu.sh:412 menu.sh:542 menu.sh:682 menu.sh:995 menu.sh:1640 -#: menu.sh:1788 menu.sh:1856 +#: menu.sh:266 menu.sh:412 menu.sh:542 menu.sh:682 menu.sh:995 menu.sh:1663 +#: menu.sh:1831 menu.sh:1899 msgid "Exit" msgstr "退出" #: menu.sh:278 menu.sh:283 menu.sh:289 menu.sh:300 menu.sh:308 menu.sh:326 #: menu.sh:340 menu.sh:345 menu.sh:349 menu.sh:363 menu.sh:367 menu.sh:374 -#: menu.sh:377 menu.sh:1767 +#: menu.sh:377 menu.sh:1810 msgid "Addons" msgstr "插件" @@ -305,7 +305,7 @@ msgstr "没有要删除的用户插件" msgid "Select addon to remove" msgstr "选择要删除的插件" -#: menu.sh:346 menu.sh:1236 menu.sh:1267 menu.sh:1300 menu.sh:1702 +#: menu.sh:346 menu.sh:1236 menu.sh:1267 menu.sh:1300 menu.sh:1745 msgid "This feature is only available when accessed via web/ssh." msgstr "此功能仅通过web/ssh访问时可用." @@ -313,7 +313,7 @@ msgstr "此功能仅通过web/ssh访问时可用." msgid "Please upload the *.addons file." msgstr "请上传 *.addons 文件." -#: menu.sh:364 menu.sh:517 menu.sh:1729 menu.sh:1743 +#: menu.sh:364 menu.sh:517 menu.sh:1772 menu.sh:1786 msgid "Not a valid file, please try again!" msgstr "不是有效的文件, 请重试!" @@ -330,7 +330,7 @@ msgid "File format not recognized!" msgstr "文件格式无法识别!" #: menu.sh:393 menu.sh:421 menu.sh:425 menu.sh:442 menu.sh:455 menu.sh:469 -#: menu.sh:475 menu.sh:494 menu.sh:497 menu.sh:512 menu.sh:516 menu.sh:1768 +#: menu.sh:475 menu.sh:494 menu.sh:497 menu.sh:512 menu.sh:516 menu.sh:1811 msgid "Modules" msgstr "模块" @@ -607,7 +607,7 @@ msgstr "拷贝文件: " msgid "Addon %s not found!" msgstr "插件 %s 未找到!" -#: menu.sh:953 menu.sh:1839 +#: menu.sh:953 menu.sh:1882 msgid "Cleaning" msgstr "清除中" @@ -690,7 +690,7 @@ msgstr "开发者工具" msgid "Advanced" msgstr "高级" -#: menu.sh:998 menu.sh:1791 +#: menu.sh:998 menu.sh:1834 msgid "Choose the option" msgstr "设置" @@ -898,7 +898,7 @@ msgstr "警告" msgid "Config changed, would you like to rebuild the loader?" msgstr "配置已更改, 是否重新编译引导?" -#: menu.sh:1461 menu.sh:1782 +#: menu.sh:1461 menu.sh:1825 msgid "Choose a language" msgstr "选择语言" @@ -910,196 +910,205 @@ msgstr "选择布局" msgid "Choice a keymap" msgstr "选择键盘" -#: menu.sh:1505 menu.sh:1538 menu.sh:1588 menu.sh:1645 menu.sh:1653 -#: menu.sh:1661 menu.sh:1669 +#: menu.sh:1506 menu.sh:1554 menu.sh:1605 menu.sh:1668 menu.sh:1672 +#: menu.sh:1676 menu.sh:1680 menu.sh:1688 menu.sh:1696 menu.sh:1704 +#: menu.sh:1712 msgid "Update %s" msgstr "更新 %s" -#: menu.sh:1508 +#: menu.sh:1509 msgid "Checking last version" msgstr "检测新版本中" -#: menu.sh:1516 +#: menu.sh:1518 menu.sh:1521 msgid "Error checking new version" msgstr "检测新版本错误" -#: menu.sh:1521 +#: menu.sh:1528 +msgid "No new version." +msgstr "没有新版本." + +#: menu.sh:1531 msgid "No new version. Actual version is %s\\nForce update?" msgstr "没有新版本. 实际版本为 %s\\n强制更新?" -#: menu.sh:1525 +#: menu.sh:1536 msgid "Downloading last version" msgstr "下载新版本中" -#: menu.sh:1530 +#: menu.sh:1542 menu.sh:1545 msgid "Error downloading new version" msgstr "下载新版本错误" -#: menu.sh:1540 menu.sh:1590 +#: menu.sh:1556 menu.sh:1607 msgid "Extracting last version" msgstr "解压新版本" -#: menu.sh:1544 +#: menu.sh:1560 msgid "Error extracting update file" msgstr "更新文件解压错误" -#: menu.sh:1551 +#: menu.sh:1567 msgid "Checksum do not match!" msgstr "Checksum不匹配!" -#: menu.sh:1560 +#: menu.sh:1576 msgid "" "The current version does not support upgrading to the latest update.zip. " "Please remake the bootloader disk!" msgstr "当前版本不支持最新的update.zip升级, 请重新制作引导盘!" -#: menu.sh:1565 +#: menu.sh:1581 msgid "Installing new files" msgstr "安装更新中" -#: menu.sh:1582 +#: menu.sh:1598 msgid "Arpl updated with success to %s!\\nReboot?" msgstr "Arpl更新成功 %s!\\n重启?" -#: menu.sh:1596 +#: menu.sh:1613 msgid "Installing new %s" msgstr "安装新 %s 中" -#: menu.sh:1624 +#: menu.sh:1642 menu.sh:1645 msgid "%s updated with success!" msgstr "%s 更新成功!" -#: menu.sh:1634 +#: menu.sh:1656 +msgid "Update all" +msgstr "更新所有" + +#: menu.sh:1657 msgid "Update arpl" msgstr "更新arpl" -#: menu.sh:1635 +#: menu.sh:1658 msgid "Update addons" msgstr "更新插件" -#: menu.sh:1636 +#: menu.sh:1659 msgid "Update modules" msgstr "更新模块" -#: menu.sh:1637 +#: menu.sh:1660 msgid "Update LKMs" msgstr "更新LKMs" -#: menu.sh:1638 +#: menu.sh:1661 msgid "Set proxy server" msgstr "设置代理" -#: menu.sh:1639 +#: menu.sh:1662 msgid "Local upload" msgstr "本地上传" -#: menu.sh:1645 -msgid "arpl" -msgstr "arpl" - -#: menu.sh:1653 +#: menu.sh:1668 menu.sh:1696 msgid "addons" msgstr "插件" -#: menu.sh:1661 +#: menu.sh:1672 menu.sh:1704 msgid "modules" msgstr "模块" -#: menu.sh:1669 +#: menu.sh:1676 menu.sh:1712 msgid "LKMs" msgstr "LKMs" -#: menu.sh:1679 menu.sh:1690 menu.sh:1701 menu.sh:1711 menu.sh:1728 -#: menu.sh:1742 +#: menu.sh:1680 menu.sh:1688 +msgid "arpl" +msgstr "arpl" + +#: menu.sh:1722 menu.sh:1733 menu.sh:1744 menu.sh:1754 menu.sh:1771 +#: menu.sh:1785 msgid "Update" msgstr "更新" -#: menu.sh:1680 +#: menu.sh:1723 msgid "Please enter a proxy server url" msgstr "请输入代理服务器url" -#: menu.sh:1691 +#: menu.sh:1734 msgid "Invalid proxy server url, continue?" msgstr "无效的代理服务器url,是否继续?" -#: menu.sh:1706 +#: menu.sh:1749 msgid "" "Please keep the attachment name consistent with the attachment name on " "Github.\\n" msgstr "请保持附件名称与 github 上附件名称一致.\\n" -#: menu.sh:1707 +#: menu.sh:1750 msgid "Upload update.zip will update arpl.\\n" msgstr "上传 update.zip 将更新 arpl.\\n" -#: menu.sh:1708 +#: menu.sh:1751 msgid "Upload addons.zip will update Addons.\\n" msgstr "上传 addons.zip 将更新 插件.\\n" -#: menu.sh:1709 +#: menu.sh:1752 msgid "Upload modules.zip will update Modules.\\n" msgstr "上传 modules.zip 将更新 模块.\\n" -#: menu.sh:1710 +#: menu.sh:1753 msgid "Upload rp-lkms.zip will update LKMs.\\n" msgstr "上传 rp-lkms.zip 将更新 LKMs.\\n" -#: menu.sh:1763 +#: menu.sh:1806 msgid "Choose a model" msgstr "选择型号" -#: menu.sh:1769 +#: menu.sh:1812 msgid "Cmdline menu" msgstr "设置Cmdline" -#: menu.sh:1770 +#: menu.sh:1813 msgid "Synoinfo menu" msgstr "设置Synoinfo" -#: menu.sh:1773 +#: menu.sh:1816 msgid "Advanced menu" msgstr "高级设置" -#: menu.sh:1776 +#: menu.sh:1819 msgid "Build the loader" msgstr "编译引导" -#: menu.sh:1780 +#: menu.sh:1823 msgid "Boot the loader" msgstr "启动" -#: menu.sh:1783 +#: menu.sh:1826 msgid "Choose a keymap" msgstr "选择键盘" -#: menu.sh:1785 +#: menu.sh:1828 msgid "Clean disk cache" msgstr "清除磁盘缓存" -#: menu.sh:1787 +#: menu.sh:1830 msgid "Update menu" msgstr "更新" -#: menu.sh:1851 +#: menu.sh:1894 msgid "Choose a action" msgstr "选择动作" -#: menu.sh:1852 +#: menu.sh:1895 msgid "Poweroff" msgstr "关机" -#: menu.sh:1853 +#: menu.sh:1896 msgid "Reboot" msgstr "重启" -#: menu.sh:1854 +#: menu.sh:1897 msgid "Reboot to arpl" msgstr "重启到arpl" -#: menu.sh:1855 +#: menu.sh:1898 msgid "Back to shell" msgstr "退出到shell" -#: menu.sh:1881 +#: menu.sh:1924 msgid "Call \\033[1;32mmenu.sh\\033[0m to return to menu" msgstr "执行 \\033[1;32mmenu.sh\\033[0m 重新进入设置菜单" diff --git a/files/board/arpl/overlayfs/opt/arpl/menu.sh b/files/board/arpl/overlayfs/opt/arpl/menu.sh index 569584a1..df2985fd 100755 --- a/files/board/arpl/overlayfs/opt/arpl/menu.sh +++ b/files/board/arpl/overlayfs/opt/arpl/menu.sh @@ -202,17 +202,17 @@ function productversMenu() { --form "${MSG}" 10 110 2 "URL" 1 1 "${paturl}" 1 5 100 0 "MD5" 2 1 "${patsum}" 2 5 100 0 \ 2>"${TMP_PATH}/resp" [ $? -ne 0 ] && return - [ -z "${paturl}" -o -z "${patsum}" ] && return paturl="$(cat "${TMP_PATH}/resp" | tail -n +1 | head -1)" patsum="$(cat "${TMP_PATH}/resp" | tail -n +2 | head -1)" + [ -z "${paturl}" -o -z "${patsum}" ] && return writeConfigKey "paturl" "${paturl}" "${USER_CONFIG_FILE}" writeConfigKey "patsum" "${patsum}" "${USER_CONFIG_FILE}" PRODUCTVER=${resp} writeConfigKey "productver" "${PRODUCTVER}" "${USER_CONFIG_FILE}" BUILDNUM="" SMALLNUM="" - writeConfigKey "buildnum" "" "${USER_CONFIG_FILE}" - writeConfigKey "smallnum" "" "${USER_CONFIG_FILE}" + writeConfigKey "buildnum" "${BUILDNUM}" "${USER_CONFIG_FILE}" + writeConfigKey "smallnum" "${SMALLNUM}" "${USER_CONFIG_FILE}" dialog --backtitle "$(backtitle)" --colors --title "$(TEXT "Product Version")" \ --infobox "$(TEXT "Reconfiguring Synoinfo, Addons and Modules")" 0 0 # Delete synoinfo and reload model/build synoinfo @@ -1499,6 +1499,7 @@ function keymapMenu() { # 2 - current version # 3 - repo url # 4 - attachment name +# 5 - silent function downloadExts() { PROXY="$(readConfigKey "proxy" "${USER_CONFIG_FILE}")" [ -n "${PROXY}" ] && [[ "${PROXY: -1}" != "/" ]] && PROXY="${PROXY}/" @@ -1512,22 +1513,38 @@ function downloadExts() { TAG="${LATESTURL##*/}" [ "${TAG:0:1}" = "v" ] && TAG="${TAG:1}" if [ -z "${TAG}" ]; then - dialog --backtitle "$(backtitle)" --colors --title "${T}" \ - --msgbox "$(TEXT "Error checking new version")" 0 0 + if [ ! "${5}" = "0" ]; then + dialog --backtitle "$(backtitle)" --colors --title "${T}" \ + --infobox "$(TEXT "Error checking new version")" 0 0 + else + dialog --backtitle "$(backtitle)" --colors --title "${T}" \ + --msgbox "$(TEXT "Error checking new version")" 0 0 + fi return 1 fi if [ "${2}" = "${TAG}" ]; then - dialog --backtitle "$(backtitle)" --colors --title "${T}" \ - --yesno "$(printf "$(TEXT "No new version. Actual version is %s\nForce update?")" "${2}")" 0 0 - [ $? -ne 0 ] && return 1 + if [ ! "${5}" = "0" ]; then + dialog --backtitle "$(backtitle)" --colors --title "${T}" \ + --infobox "$(TEXT "No new version.")" 0 0 + return 1 + else + dialog --backtitle "$(backtitle)" --colors --title "${T}" \ + --yesno "$(printf "$(TEXT "No new version. Actual version is %s\nForce update?")" "${2}")" 0 0 + [ $? -ne 0 ] && return 1 + fi fi dialog --backtitle "$(backtitle)" --colors --title "${T}" \ --infobox "$(TEXT "Downloading last version")" 0 0 rm -f "/tmp/${4}.zip" STATUS=$(curl -kL -w "%{http_code}" "${PROXY}${3}/releases/download/${TAG}/${4}.zip" -o "/tmp/${4}.zip") if [ $? -ne 0 -o ${STATUS} -ne 200 ]; then - dialog --backtitle "$(backtitle)" --colors --title "${T}" \ - --msgbox "$(TEXT "Error downloading new version")" 0 0 + if [ ! "${5}" = "0" ]; then + dialog --backtitle "$(backtitle)" --colors --title "${T}" \ + --infobox "$(TEXT "Error downloading new version")" 0 0 + else + dialog --backtitle "$(backtitle)" --colors --title "${T}" \ + --msgbox "$(TEXT "Error downloading new version")" 0 0 + fi return 1 fi return 0 @@ -1542,14 +1559,14 @@ function updateArpl() { if [ $? -ne 0 ]; then dialog --backtitle "$(backtitle)" --colors --title "${T}" \ --msgbox "$(TEXT "Error extracting update file")" 0 0 - continue + return 1 fi # Check checksums (cd /tmp && sha256sum --status -c sha256sum) if [ $? -ne 0 ]; then dialog --backtitle "$(backtitle)" --colors --title "${T}" \ --msgbox "$(TEXT "Checksum do not match!")" 0 0 - continue + return 1 fi # Check conditions if [ -f "/tmp/update-check.sh" ]; then @@ -1558,7 +1575,7 @@ function updateArpl() { if [ $? -ne 0 ]; then dialog --backtitle "$(backtitle)" --colors --title "${T}" \ --msgbox "$(TEXT "The current version does not support upgrading to the latest update.zip. Please remake the bootloader disk!")" 0 0 - continue + return 1 fi fi dialog --backtitle "$(backtitle)" --colors --title "${T}" \ @@ -1584,6 +1601,7 @@ function updateArpl() { } # 1 - ext name +# 2 - silent function updateExts() { T="$(printf "$(TEXT "Update %s")" "${1}")" dialog --backtitle "$(backtitle)" --colors --title "${T}" \ @@ -1620,8 +1638,13 @@ function updateExts() { unzip /tmp/rp-lkms.zip -d "${LKM_PATH}" >/dev/null 2>&1 fi DIRTY=1 - dialog --backtitle "$(backtitle)" --colors --title "${T}" \ - --msgbox "$(printf "$(TEXT "%s updated with success!")" "${1}")" 0 0 + if [ ! "${2}" = "0" ]; then + dialog --backtitle "$(backtitle)" --colors --title "${T}" \ + --infobox "$(printf "$(TEXT "%s updated with success!")" "${1}")" 0 0 + else + dialog --backtitle "$(backtitle)" --colors --title "${T}" \ + --msgbox "$(printf "$(TEXT "%s updated with success!")" "${1}")" 0 0 + fi } ############################################################################### @@ -1631,7 +1654,8 @@ function updateMenu() { while true; do dialog --backtitle "$(backtitle)" --colors \ --menu "$(TEXT "Choose a option")" 0 0 0 \ - a "$(TEXT "Update arpl")" \ + a "$(TEXT "Update all")" \ + r "$(TEXT "Update arpl")" \ d "$(TEXT "Update addons")" \ m "$(TEXT "Update modules")" \ l "$(TEXT "Update LKMs")" \ @@ -1642,9 +1666,29 @@ function updateMenu() { [ $? -ne 0 ] && return case "$(<${TMP_PATH}/resp)" in a) + T="$(printf "$(TEXT "Update %s")" "$(TEXT "addons")")" + CURVER="$(cat "/mnt/p3/addons/VERSION" 2>/dev/null)" + downloadExts "addons" "${CURVER:-0}" "https://github.com/wjz304/arpl-addons" "addons" "1" + [ $? -eq 0 ] && updateExts "addons" "1" + T="$(printf "$(TEXT "Update %s")" "$(TEXT "modules")")" + CURVER="$(cat "/mnt/p3/modules/VERSION" 2>/dev/null)" + downloadExts "modules" "${CURVER:-0}" "https://github.com/wjz304/arpl-modules" "modules" "1" + [ $? -eq 0 ] && updateExts "modules" "1" + T="$(printf "$(TEXT "Update %s")" "$(TEXT "LKMs")")" + CURVER="$(cat "/mnt/p3/lkms/VERSION" 2>/dev/null)" + downloadExts "LKMs" "${CURVER:-0}" "https://github.com/wjz304/redpill-lkm" "rp-lkms" "1" + [ $? -eq 0 ] && updateExts "LKMs" "1" + T="$(printf "$(TEXT "Update %s")" "$(TEXT "arpl")")" + CURVER="${ARPL_VERSION:-0}" + downloadExts "arpl" ${CURVER} "https://github.com/wjz304/arpl-i18n" "update" "0" + [ $? -ne 0 ] && continue + updateArpl "arpl" + ;; + + r) T="$(printf "$(TEXT "Update %s")" "$(TEXT "arpl")")" CURVER="${ARPL_VERSION:-0}" - downloadExts "arpl" ${CURVER} "https://github.com/wjz304/arpl-i18n" "update" + downloadExts "arpl" ${CURVER} "https://github.com/wjz304/arpl-i18n" "update" "0" [ $? -ne 0 ] && continue updateArpl "arpl" ;; @@ -1652,25 +1696,25 @@ function updateMenu() { d) T="$(printf "$(TEXT "Update %s")" "$(TEXT "addons")")" CURVER="$(cat "/mnt/p3/addons/VERSION" 2>/dev/null)" - downloadExts "addons" "${CURVER:-0}" "https://github.com/wjz304/arpl-addons" "addons" + downloadExts "addons" "${CURVER:-0}" "https://github.com/wjz304/arpl-addons" "addons" "0" [ $? -ne 0 ] && continue - updateExts "addons" + updateExts "addons" "0" ;; m) T="$(printf "$(TEXT "Update %s")" "$(TEXT "modules")")" CURVER="$(cat "/mnt/p3/modules/VERSION" 2>/dev/null)" - downloadExts "modules" "${CURVER:-0}" "https://github.com/wjz304/arpl-modules" "modules" + downloadExts "modules" "${CURVER:-0}" "https://github.com/wjz304/arpl-modules" "modules" "0" [ $? -ne 0 ] && continue - updateExts "modules" + updateExts "modules" "0" ;; l) T="$(printf "$(TEXT "Update %s")" "$(TEXT "LKMs")")" CURVER="$(cat "/mnt/p3/lkms/VERSION" 2>/dev/null)" - downloadExts "LKMs" "${CURVER:-0}" "https://github.com/wjz304/redpill-lkm" "rp-lkms" + downloadExts "LKMs" "${CURVER:-0}" "https://github.com/wjz304/redpill-lkm" "rp-lkms" "0" [ $? -ne 0 ] && continue - updateExts "LKMs" + updateExts "LKMs" "0" ;; p) @@ -1733,11 +1777,11 @@ function updateMenu() { if [ "${USER_FILE}" = "update.zip" ]; then updateArpl "arpl" elif [ "${USER_FILE}" = "addons.zip" ]; then - updateExts "addons" + updateExts "addons" "0" elif [ "${USER_FILE}" = "modules.zip" ]; then - updateExts "modules" + updateExts "modules" "0" elif [ "${USER_FILE}" = "rp-lkms.zip" ]; then - updateExts "LKMs" + updateExts "LKMs" "0" else dialog --backtitle "$(backtitle)" --colors --title "$(TEXT "Update")" \ --msgbox "$(TEXT "Not a valid file, please try again!")" 0 0 @@ -1758,7 +1802,7 @@ if [ "x$1" = "xb" -a -n "${MODEL}" -a -n "${PRODUCTVER}" -a loaderIsConfigured ] boot && exit 0 || sleep 5 fi # Main loop -[ -n "${MODEL}" ] && NEXT="v" || NEXT="m" +[ -n "${MODEL}" ] && NEXT="v" || NEXT="m" while true; do echo "m \"$(TEXT "Choose a model")\"" >"${TMP_PATH}/menu" if [ -n "${MODEL}" ]; then