From 1cc3423a9fb10fd013346105f7faf3b9ea637276 Mon Sep 17 00:00:00 2001 From: Ing Date: Sat, 16 Dec 2023 18:15:08 +0800 Subject: [PATCH] fix someething --- files/initrd/opt/rr/boot.sh | 6 +- files/initrd/opt/rr/lang/rr.pot | 42 ++--- files/initrd/opt/rr/lang/zh_CN.po | 62 +++---- files/initrd/opt/rr/lang/zh_HK.po | 4 +- files/initrd/opt/rr/lang/zh_TW.po | 269 ++++++++++++++++++++---------- files/initrd/opt/rr/menu.sh | 8 +- 6 files changed, 244 insertions(+), 147 deletions(-) diff --git a/files/initrd/opt/rr/boot.sh b/files/initrd/opt/rr/boot.sh index 4c209d36..f729b51b 100755 --- a/files/initrd/opt/rr/boot.sh +++ b/files/initrd/opt/rr/boot.sh @@ -126,6 +126,8 @@ if [ ! "${BUS}" = "usb" ]; then fi CMDLINE['panic']="${KERNELPANIC:-0}" CMDLINE['console']="ttyS0,115200n8" +CMDLINE['no_console_suspend']="1" +CMDLINE['consoleblank']="0" CMDLINE['earlyprintk']="" CMDLINE['earlycon']="uart8250,io,0x3f8,115200n8" CMDLINE['root']="/dev/md0" @@ -229,7 +231,7 @@ else rm -f WB WC echo -en "\r$(printf "%$((${#MSG} * 2))s" " ")\n" - echo -e "\033[1;37m$(TEXT "Loading DSM kernel...")\033[0m" + echo -e "\033[1;37m$(TEXT "Loading DSM kernel ...")\033[0m" DSMLOGO="$(readConfigKey "dsmlogo" "${USER_CONFIG_FILE}")" if [ "${DSMLOGO}" = "true" -a -c "/dev/fb0" ]; then @@ -247,7 +249,7 @@ else else kexec -l "${MOD_ZIMAGE_FILE}" --initrd "${MOD_RDGZ_FILE}" --command-line="${CMDLINE_LINE}" >"${LOG_FILE}" 2>&1 || dieLog fi - echo -e "\033[1;37m$(TEXT "Booting...")\033[0m" + echo -e "\033[1;37m$(TEXT "Booting ...")\033[0m" for T in $(w | grep -v "TTY" | awk -F' ' '{print $2}'); do echo -e "\n\033[1;43m$(TEXT "[This interface will not be operational. Please wait a few minutes.\nFind DSM via http://find.synology.com/ or Synology Assistant and connect.]")\033[0m\n" >"/dev/${T}" 2>/dev/null || true done diff --git a/files/initrd/opt/rr/lang/rr.pot b/files/initrd/opt/rr/lang/rr.pot index 1876c6e7..1ffc6127 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: 2023-12-09 23:21+0800\n" +"POT-Creation-Date: 2023-12-16 18:02+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -85,63 +85,63 @@ msgid "" "for the bootloader disk." msgstr "" -#: boot.sh:152 +#: boot.sh:154 msgid "Cmdline:\\n" msgstr "" -#: boot.sh:158 +#: boot.sh:160 msgid "Reboot to boot directly in DSM" msgstr "" -#: boot.sh:164 init.sh:119 +#: boot.sh:166 init.sh:119 msgid "Detected %s network cards." msgstr "" -#: boot.sh:165 init.sh:120 +#: boot.sh:167 init.sh:120 msgid "Checking Connect." msgstr "" -#: boot.sh:185 +#: boot.sh:187 msgid "Waiting IP.(For reference only)" msgstr "" -#: boot.sh:192 init.sh:145 +#: boot.sh:194 init.sh:145 msgid "DOWN" msgstr "" -#: boot.sh:196 init.sh:149 +#: boot.sh:198 init.sh:149 msgid "NOT CONNECTED" msgstr "" -#: boot.sh:200 init.sh:153 +#: boot.sh:202 init.sh:153 msgid "TIMEOUT (Please check the IP on the router.)" msgstr "" -#: boot.sh:206 +#: boot.sh:208 msgid "Access \\033[1;34mhttp://%s:5000\\033[0m to connect the DSM via web." msgstr "" -#: boot.sh:218 +#: boot.sh:220 msgid "%2ds (Changing access(ssh/web) status will interrupt boot)" msgstr "" -#: boot.sh:222 +#: boot.sh:224 msgid "access(ssh/web) status has changed and booting is interrupted." msgstr "" -#: boot.sh:232 -msgid "Loading DSM kernel..." +#: boot.sh:234 +msgid "Loading DSM kernel ..." msgstr "" -#: boot.sh:245 +#: boot.sh:247 msgid "Warning, running kexec with --noefi param, strange things will happen!!" msgstr "" -#: boot.sh:250 -msgid "Booting..." +#: boot.sh:252 +msgid "Booting ..." msgstr "" -#: boot.sh:252 +#: boot.sh:254 msgid "" "[This interface will not be operational. Please wait a few minutes.\\nFind " "DSM via http://find.synology.com/ or Synology Assistant and connect.]" @@ -318,7 +318,9 @@ msgid "" msgstr "" #: menu.sh:419 menu.sh:548 menu.sh:1509 menu.sh:2079 -msgid "This feature is only available when accessed via ssh (Requires a terminal that supports ZModem protocol)." +msgid "" +"This feature is only available when accessed via ssh (Requires a terminal " +"that supports ZModem protocol)." msgstr "" #: menu.sh:423 @@ -610,7 +612,7 @@ msgid "Downloading old pat to extract synology .pat extractor..." msgstr "" #: menu.sh:948 menu.sh:951 -msgid "Extracting..." +msgid "Extracting ..." msgstr "" #: menu.sh:962 diff --git a/files/initrd/opt/rr/lang/zh_CN.po b/files/initrd/opt/rr/lang/zh_CN.po index 7b78474f..14a73483 100644 --- a/files/initrd/opt/rr/lang/zh_CN.po +++ b/files/initrd/opt/rr/lang/zh_CN.po @@ -1,15 +1,15 @@ # Chinese translations for RR package. # Copyright (C) 2023 THE RR'S COPYRIGHT HOLDER # This file is distributed under the same license as the RR package. -# ing , 2023. +# ing , 2023. # msgid "" msgstr "" "Project-Id-Version: RR\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-12-09 23:21+0800\n" -"PO-Revision-Date: 2023-12-09 23:28+0800\n" -"Last-Translator: ing \n" +"POT-Creation-Date: 2023-12-16 18:02+0800\n" +"PO-Revision-Date: 2023-12-16 18:09+0800\n" +"Last-Translator: ing \n" "Language-Team: Chinese (simplified) \n" "Language: zh_CN\n" "MIME-Version: 1.0\n" @@ -85,63 +85,63 @@ msgid "" "for the bootloader disk." msgstr "除引导盘外, 请至少插入一块 sata/scsi 磁盘进行系统安装." -#: boot.sh:152 +#: boot.sh:154 msgid "Cmdline:\\n" msgstr "Cmdline:\\n" -#: boot.sh:158 +#: boot.sh:160 msgid "Reboot to boot directly in DSM" msgstr "重启并直接进入 DSM 引导" -#: boot.sh:164 init.sh:119 +#: boot.sh:166 init.sh:119 msgid "Detected %s network cards." msgstr "检测到 %s 个网卡." -#: boot.sh:165 init.sh:120 +#: boot.sh:167 init.sh:120 msgid "Checking Connect." msgstr "检查连接." -#: boot.sh:185 +#: boot.sh:187 msgid "Waiting IP.(For reference only)" msgstr "获取 IP.(仅供参考)" -#: boot.sh:192 init.sh:145 +#: boot.sh:194 init.sh:145 msgid "DOWN" msgstr "关闭" -#: boot.sh:196 init.sh:149 +#: boot.sh:198 init.sh:149 msgid "NOT CONNECTED" msgstr "未连接" -#: boot.sh:200 init.sh:153 +#: boot.sh:202 init.sh:153 msgid "TIMEOUT (Please check the IP on the router.)" msgstr "超时 (请检查路由器上的IP.)" -#: boot.sh:206 +#: boot.sh:208 msgid "Access \\033[1;34mhttp://%s:5000\\033[0m to connect the DSM via web." msgstr "在浏览器中访问 \\033[1;34mhttp://%s:5000\\033[0m 链接 DSM." -#: boot.sh:218 +#: boot.sh:220 msgid "%2ds (Changing access(ssh/web) status will interrupt boot)" msgstr "%2ds ((ssh/web)连接状态改变将中断启动)" -#: boot.sh:222 +#: boot.sh:224 msgid "access(ssh/web) status has changed and booting is interrupted." msgstr "(ssh/web)连接状态已改变, 启动被中断." -#: boot.sh:232 -msgid "Loading DSM kernel..." -msgstr "加载 DSM 内核..." +#: boot.sh:234 +msgid "Loading DSM kernel ..." +msgstr "加载 DSM 内核 ..." -#: boot.sh:245 +#: boot.sh:247 msgid "Warning, running kexec with --noefi param, strange things will happen!!" msgstr "警告, 使用'--noefi'参数运行'kexec', 可能有不好的事情发生!!" -#: boot.sh:250 -msgid "Booting..." -msgstr "引导中..." - #: boot.sh:252 +msgid "Booting ..." +msgstr "引导中 ..." + +#: boot.sh:254 msgid "" "[This interface will not be operational. Please wait a few minutes.\\nFind " "DSM via http://find.synology.com/ or Synology Assistant and connect.]" @@ -321,7 +321,9 @@ msgid "" msgstr "名称颜色为\"\\Z4蓝色\\Zn\"的为已添加, 颜色为\"黑色\"的为未添加.\\n\\n" #: menu.sh:419 menu.sh:548 menu.sh:1509 menu.sh:2079 -msgid "This feature is only available when accessed via ssh (Requires a terminal that supports ZModem protocol)." +msgid "" +"This feature is only available when accessed via ssh (Requires a terminal " +"that supports ZModem protocol)." msgstr "此功能仅在通过 ssh 访问时可用(需要支持ZModem协议的终端)." #: menu.sh:423 @@ -623,8 +625,8 @@ msgid "Downloading old pat to extract synology .pat extractor..." msgstr "下载旧 pat, 提取 .pat 解密程序中..." #: menu.sh:948 menu.sh:951 -msgid "Extracting..." -msgstr "解压中..." +msgid "Extracting ..." +msgstr "解压中 ..." #: menu.sh:962 msgid "pat Invalid, try again!" @@ -794,7 +796,7 @@ msgstr "临时 IP: (UI 不会刷新)" #: menu.sh:1191 msgid "Setting IP ..." -msgstr "设置 IP.." +msgstr "设置 IP ..." #: menu.sh:1196 msgid "Scanning ..." @@ -844,7 +846,7 @@ msgstr "警告:\\n该操作不可逆, 请提前备份重要数据. 是否继续? #: menu.sh:1361 msgid "Removing ..." -msgstr "删除中..." +msgstr "删除中 ..." #: menu.sh:1362 msgid "Remove VERSION file for all disks completed." @@ -861,7 +863,7 @@ msgstr "警告:\\n当前的硬盘处于 raid 中,是否仍要格式化?" #: menu.sh:1400 msgid "Formatting ..." -msgstr "格式化中..." +msgstr "格式化中 ..." #: menu.sh:1402 msgid "Formatting is complete." @@ -911,7 +913,7 @@ msgstr "警告:\\n请不要中途停止, 否则将导致 RR 引导损毁, 是否 #: menu.sh:1489 msgid "Saving ..." -msgstr "保存中..." +msgstr "保存中 ..." #: menu.sh:1504 msgid "Save is complete." diff --git a/files/initrd/opt/rr/lang/zh_HK.po b/files/initrd/opt/rr/lang/zh_HK.po index 85b35af5..c02a0003 100644 --- a/files/initrd/opt/rr/lang/zh_HK.po +++ b/files/initrd/opt/rr/lang/zh_HK.po @@ -1,7 +1,7 @@ # Chinese translations for RR package. # Copyright (C) 2023 THE RR'S COPYRIGHT HOLDER # This file is distributed under the same license as the RR package. -# ing , 2023. +# ing , 2023. # msgid "" msgstr "" @@ -9,7 +9,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2023-12-09 23:21+0800\n" "PO-Revision-Date: 2023-12-09 23:31+0800\n" -"Last-Translator: ing \n" +"Last-Translator: ing \n" "Language-Team: Chinese (HongKong) \n" "Language: zh_HK\n" "MIME-Version: 1.0\n" diff --git a/files/initrd/opt/rr/lang/zh_TW.po b/files/initrd/opt/rr/lang/zh_TW.po index c13bff92..3b712bdb 100644 --- a/files/initrd/opt/rr/lang/zh_TW.po +++ b/files/initrd/opt/rr/lang/zh_TW.po @@ -7,10 +7,10 @@ msgid "" msgstr "" "Project-Id-Version: RR\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-12-09 23:21+0800\n" -"PO-Revision-Date: 2023-12-10 23:24+0800\n" -"Last-Translator: March Fun \n" -"Language-Team: Chinese (Taiwan) \n" +"POT-Creation-Date: 2023-12-16 18:02+0800\n" +"PO-Revision-Date: 2023-12-16 18:11+0800\n" +"Last-Translator: March Fun \n" +"Language-Team: Chinese (Taiwan) \n" "Language: zh_TW\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -34,7 +34,9 @@ msgid "DSM zImage changed" msgstr "DSM zImage 已變更" #: boot.sh:36 menu.sh:1012 -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:45 @@ -42,7 +44,9 @@ msgid "DSM Ramdisk changed" msgstr "DSM Ramdisk 已變更" #: boot.sh:48 menu.sh:1018 -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:67 @@ -70,72 +74,80 @@ msgid "MEM: " msgstr "MEM: " #: boot.sh:75 -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:87 -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:152 +#: boot.sh:154 msgid "Cmdline:\\n" msgstr "Cmdline:\\n" -#: boot.sh:158 +#: boot.sh:160 msgid "Reboot to boot directly in DSM" msgstr "重新開機以直接啟動 DSM" -#: boot.sh:164 init.sh:119 +#: boot.sh:166 init.sh:119 msgid "Detected %s network cards." msgstr "檢測到 %s 個網路卡。" -#: boot.sh:165 init.sh:120 +#: boot.sh:167 init.sh:120 msgid "Checking Connect." msgstr "檢查連線。" -#: boot.sh:185 +#: boot.sh:187 msgid "Waiting IP.(For reference only)" msgstr "正在取得 IP (僅供參考)" -#: boot.sh:192 init.sh:145 +#: boot.sh:194 init.sh:145 msgid "DOWN" msgstr "關機" -#: boot.sh:196 init.sh:149 +#: boot.sh:198 init.sh:149 msgid "NOT CONNECTED" msgstr "未連線" -#: boot.sh:200 init.sh:153 +#: boot.sh:202 init.sh:153 msgid "TIMEOUT (Please check the IP on the router.)" msgstr "逾時 (請檢查路由器上的IP.)" -#: boot.sh:206 +#: boot.sh:208 msgid "Access \\033[1;34mhttp://%s:5000\\033[0m to connect the DSM via web." msgstr "在瀏覽器中瀏覽 \\033[1;34mhttp://%s:5000\\033[0m 連線 DSM。" -#: boot.sh:218 +#: boot.sh:220 msgid "%2ds (Changing access(ssh/web) status will interrupt boot)" msgstr "%2ds (變更存取 (ssh/web) 狀態將中斷開機)" -#: boot.sh:222 +#: boot.sh:224 msgid "access(ssh/web) status has changed and booting is interrupted." msgstr "存取 (ssh/web) 狀態已變更,開機已中斷。" -#: boot.sh:232 -msgid "Loading DSM kernel..." -msgstr "載入 DSM 核心..." +#: boot.sh:234 +msgid "Loading DSM kernel ..." +msgstr "載入 DSM 核心 ..." -#: boot.sh:245 +#: boot.sh:247 msgid "Warning, running kexec with --noefi param, strange things will happen!!" msgstr "警告,使用'--noefi'參數執行'kexec',可能有意外事情發生!" -#: boot.sh:250 -msgid "Booting..." -msgstr "開機中..." - #: boot.sh:252 -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 "Booting ..." +msgstr "開機中 ..." + +#: boot.sh:254 +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!" @@ -162,8 +174,11 @@ msgid "Waiting IP." msgstr "正在取得 IP。" #: init.sh:159 -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:169 msgid "Call \\033[1;32mmenu.sh\\033[0m to configure loader" @@ -178,7 +193,9 @@ msgid "Default SSH Root password is" msgstr "預設 SSH 的 root 密碼為" #: init.sh:186 -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:99 menu.sh:133 menu.sh:176 @@ -214,19 +231,24 @@ msgid "Choose a product version" msgstr "選擇產品版本" #: menu.sh:233 -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:239 -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:250 msgid "Get pat data ..." -msgstr "取得 pat 資料..." +msgstr "取得 pat 資料 ..." #: menu.sh:269 -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:273 @@ -293,11 +315,16 @@ msgid "Select addon to remove" msgstr "選擇要删除的增益集" #: menu.sh:404 -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:419 menu.sh:548 menu.sh:1509 menu.sh:2079 -msgid "This feature is only available when accessed via ssh (Requires a terminal that supports ZModem protocol)." +msgid "" +"This feature is only available when accessed via ssh (Requires a terminal " +"that supports ZModem protocol)." msgstr "此功能僅在透過 web/ssh 存取時可用。(需要支援 ZModem 協定的終端)。" #: menu.sh:423 @@ -343,7 +370,7 @@ msgstr "優先使用官方驅動程式:" #: menu.sh:483 msgid "Reading modules ..." -msgstr "讀取模組中..." +msgstr "讀取模組中 ..." #: menu.sh:496 msgid "Select all" @@ -362,20 +389,32 @@ msgid "Selecting loaded modules" msgstr "選擇已識別的模組" #: menu.sh:552 -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:553 -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:554 -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:555 -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:556 msgid "Do you want to continue?" @@ -415,28 +454,44 @@ msgid "Commonly used cmdlines:\\n" msgstr "常用的 cmdlines:\\n" #: menu.sh:614 -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:615 -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:616 msgid " * \\Z4SataPortMap=??\\Zn\\n Sata Port Map.\\n" msgstr " * \\Z4SataPortMap=??\\Zn\\n Sata 埠地圖。\\n" #: menu.sh:617 -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:618 -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:619 -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:620 menu.sh:751 msgid "\\nEnter the parameter name and value you need to add.\\n" @@ -512,15 +567,16 @@ msgstr "%s 已快取。" #: menu.sh:834 msgid "Cleaning cache ..." -msgstr "清除快取..." +msgstr "清除快取 ..." #: menu.sh:843 -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:847 msgid "Downloading %s ..." -msgstr "下載 %s 中..." +msgstr "下載 %s 中 ..." #: menu.sh:858 menu.sh:919 msgid "Check internet or cache disk space.\\nError: %d:%d" @@ -531,7 +587,9 @@ msgid "Checking hash of %s: " msgstr "檢查 %s 的雜湊值: " #: menu.sh:867 -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:870 menu.sh:970 menu.sh:980 @@ -555,7 +613,9 @@ msgid "Encrypted" msgstr "已加密" #: menu.sh:891 -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:901 @@ -567,8 +627,8 @@ msgid "Downloading old pat to extract synology .pat extractor..." msgstr "下載舊 pat,選取 .pat 解密程式中..." #: menu.sh:948 menu.sh:951 -msgid "Extracting..." -msgstr "解壓中..." +msgid "Extracting ..." +msgstr "解壓中 ..." #: menu.sh:962 msgid "pat Invalid, try again!" @@ -588,7 +648,7 @@ msgstr "增益集 %s 未找到!" #: menu.sh:1022 msgid "Cleaning ..." -msgstr "清除中..." +msgstr "清除中 ..." #: menu.sh:1024 msgid "Ready!" @@ -738,11 +798,11 @@ msgstr "臨時 IP: (UI 不會重整)" #: menu.sh:1191 msgid "Setting IP ..." -msgstr "設定 IP..." +msgstr "設定 IP ..." #: menu.sh:1196 msgid "Scanning ..." -msgstr "掃瞄中..." +msgstr "掃瞄中 ..." #: menu.sh:1199 msgid "Scanned SSIDs:\\n" @@ -754,14 +814,16 @@ msgstr "無效的 SSID/PSK,要重試 ?" #: menu.sh:1239 msgid "Setting ..." -msgstr "設定中..." +msgstr "設定中 ..." #: menu.sh:1320 msgid "\\nTotal of ports: %s\\n" msgstr "\\n埠總數: %s\\n" #: menu.sh:1321 -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:1328 @@ -769,7 +831,9 @@ msgid "pat: (editable)" msgstr "pat: (可編輯)" #: menu.sh:1344 -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:1345 @@ -777,7 +841,9 @@ msgid "Therefore, please insert all disks before continuing.\\n" msgstr "因此,請插入所有磁碟後再繼續。\\n" #: menu.sh:1346 menu.sh:1385 -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:1361 @@ -793,7 +859,8 @@ msgid "No disk found!" msgstr "未找到磁碟!" #: menu.sh:1389 -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:1400 @@ -834,27 +901,33 @@ msgstr "請先插入所有磁碟,然後再繼續。\\n" #: menu.sh:1480 msgid "Enabling ..." -msgstr "啟用中..." +msgstr "啟用中 ..." #: menu.sh:1482 msgid "Telnet is enabled." msgstr "Telnet 已啟用。" #: menu.sh:1486 -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:1489 msgid "Saving ..." -msgstr "儲存中..." +msgstr "儲存中 ..." #: menu.sh:1504 msgid "Save is complete." msgstr "儲存完成。" #: menu.sh:1513 -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:1528 msgid "Not a valid dts file, please try again!" @@ -877,19 +950,27 @@ msgid "Disk %s size is less than 1GB and cannot be cloned!" msgstr "磁碟 %s 大小小於 1GB,無法複製!" #: menu.sh:1568 -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:1601 msgid "Cloning ..." -msgstr "複製中..." +msgstr "複製中 ..." #: menu.sh:1603 -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:1614 -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:1618 @@ -917,15 +998,21 @@ msgid " 3. Reboot into RR and go to this option.\\n" msgstr " 3. 重新啟動到 RR 並前往這個選項。\\n" #: menu.sh:1633 -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:1640 msgid "opkg installing ..." msgstr "opkg 安裝中 ..." #: menu.sh:1642 -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:1654 @@ -946,7 +1033,7 @@ msgstr "嘗試回復 DSM 系統" #: menu.sh:1719 msgid "Trying to recovery a DSM installed system ..." -msgstr "嘗試回復已安裝的 DSM 系統..." +msgstr "嘗試回復已安裝的 DSM 系統 ..." #: menu.sh:1747 msgid "Found a installation:\\nModel: %s\\nProductversion: %s" @@ -992,7 +1079,7 @@ msgstr "更新 %s" #: menu.sh:1870 msgid "Checking last version ..." -msgstr "檢測最新版本..." +msgstr "檢測最新版本 ..." #: menu.sh:1881 menu.sh:1884 msgid "Error checking new version.\\nError: TAG is %s" @@ -1008,7 +1095,7 @@ msgstr "沒有新版本。實際版本為 %s\\n強制更新?" #: menu.sh:1904 msgid "Downloading ..." -msgstr "下載中..." +msgstr "下載中 ..." #: menu.sh:1908 menu.sh:1911 msgid "Error downloading new version.\\nError: %d:%d" @@ -1027,12 +1114,14 @@ msgid "Checksum do not match!" msgstr "總和檢查碼不相符!" #: menu.sh:1942 -msgid "The current version does not support upgrading to the latest update.zip. Please remake the bootloader disk!" +msgid "" +"The current version does not support upgrading to the latest update.zip. " +"Please remake the bootloader disk!" msgstr "目前版本不支援升級到最新的 update.zip。請重新製作開機程式磁碟!" #: menu.sh:1947 msgid "Installing new files ..." -msgstr "安裝新檔案..." +msgstr "安裝新檔案 ..." #: menu.sh:1964 msgid "RR updated with success to %s!\\nReboot?" @@ -1095,7 +1184,9 @@ msgid "RR" msgstr "RR" #: menu.sh:2083 -msgid "Please keep the attachment name consistent with the attachment name on Github.\\n" +msgid "" +"Please keep the attachment name consistent with the attachment name on " +"Github.\\n" msgstr "請保持附件名稱與 Github 上的附件名稱一致。\\n" #: menu.sh:2084 diff --git a/files/initrd/opt/rr/menu.sh b/files/initrd/opt/rr/menu.sh index 8a308a88..541c2bba 100755 --- a/files/initrd/opt/rr/menu.sh +++ b/files/initrd/opt/rr/menu.sh @@ -928,7 +928,7 @@ function extractDsmFiles() { if [ $? -ne 0 ]; then rm -f "${OLDPAT_PATH}" rm -rf "${RAMDISK_PATH}" - echo -e "${LOG_FILE}" >"${MKERR_FILE}" + cat "${LOG_FILE}" >"${MKERR_FILE}" return 1 fi [ ${CLEARCACHE} -eq 1 ] && rm -f "${OLDPAT_PATH}" @@ -945,13 +945,13 @@ function extractDsmFiles() { rm -rf "${RAMDISK_PATH}" fi # Uses the extractor to untar pat file - echo "$(TEXT "Extracting...")" + echo "$(TEXT "Extracting ...")" LD_LIBRARY_PATH=${EXTRACTOR_PATH} "${EXTRACTOR_PATH}/${EXTRACTOR_BIN}" "${PAT_PATH}" "${UNTAR_PAT_PATH}" || true else - echo "$(TEXT "Extracting...")" + echo "$(TEXT "Extracting ...")" tar -xf "${PAT_PATH}" -C "${UNTAR_PAT_PATH}" >"${LOG_FILE}" 2>&1 if [ $? -ne 0 ]; then - echo -e "${LOG_FILE}" >"${MKERR_FILE}" + cat "${LOG_FILE}" >"${MKERR_FILE}" return 1 fi fi