From 39127d060d3bab4802328aa69cb9e66e989f66d2 Mon Sep 17 00:00:00 2001
From: Ing <wjz304@qq.com>
Date: Sat, 13 Jan 2024 23:21:46 +0800
Subject: [PATCH] fix i18n

---
 files/initrd/opt/rr/include/i18n.sh          |  15 +-
 files/initrd/opt/rr/lang/en_US.po            |  18 ++
 files/initrd/opt/rr/lang/{ko.po => ko_KR.po} |  18 +-
 files/initrd/opt/rr/lang/rr.pot              | 210 +++++--------------
 files/initrd/opt/rr/lang/{ru.po => ru_RU.po} |   6 +-
 files/initrd/opt/rr/menu.sh                  |   4 +-
 6 files changed, 99 insertions(+), 172 deletions(-)
 create mode 100644 files/initrd/opt/rr/lang/en_US.po
 rename files/initrd/opt/rr/lang/{ko.po => ko_KR.po} (99%)
 rename files/initrd/opt/rr/lang/{ru.po => ru_RU.po} (99%)

diff --git a/files/initrd/opt/rr/include/i18n.sh b/files/initrd/opt/rr/include/i18n.sh
index 60e536fb..9bfe9016 100755
--- a/files/initrd/opt/rr/include/i18n.sh
+++ b/files/initrd/opt/rr/include/i18n.sh
@@ -3,13 +3,20 @@
 if [ -d "/usr/share/locale" ]; then
   if [ $(ls ${WORK_PATH}/lang/*.mo 2>/dev/null | wc -l) -gt 0 ]; then
     for F in $(ls ${WORK_PATH}/lang/*.mo); do
-      mkdir -p "/usr/share/locale/$(basename "${F}" .mo)/LC_MESSAGES"
-      install "${F}" "/usr/share/locale/$(basename "${F}" .mo)/LC_MESSAGES/rr.mo"
+      LANG="$(basename "${F}" .mo)"
+      LOCALE="${LANG%%_*}"
+      if [ -d "/usr/share/locale/${LANG}" ] || [ ! -d "/usr/share/locale/${LOCALE}" ]; then
+        mkdir -p "/usr/share/locale/${LANG}/LC_MESSAGES"
+        install "${F}" "/usr/share/locale/${LANG}/LC_MESSAGES/rr.mo"
+      else
+        mkdir -p "/usr/share/locale/${LOCALE}/LC_MESSAGES"
+        install "${F}" "/usr/share/locale/${LOCALE}/LC_MESSAGES/rr.mo"
+      fi
     done
   fi
 
   if [ -f ${PART1_PATH}/.locale ]; then
-    export LANG="$(cat ${PART1_PATH}/.locale)"
+    export LC_ALL="$(cat ${PART1_PATH}/.locale)"
   fi
 
   alias TEXT='gettext "rr"'
@@ -17,4 +24,4 @@ if [ -d "/usr/share/locale" ]; then
 else
   alias TEXT='echo'
   shopt -s expand_aliases
-fi
\ No newline at end of file
+fi
diff --git a/files/initrd/opt/rr/lang/en_US.po b/files/initrd/opt/rr/lang/en_US.po
new file mode 100644
index 00000000..730b31a5
--- /dev/null
+++ b/files/initrd/opt/rr/lang/en_US.po
@@ -0,0 +1,18 @@
+# English 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 <ing@ing-pc.>, 2023.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: RR\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2024-01-12 11:12+0800\n"
+"PO-Revision-Date: 2024-01-13 23:17+0800\n"
+"Last-Translator: ing <ing@ing-pc.>\n"
+"Language-Team: English (United States) <i18n-zh@RROrg>\n"
+"Language: en_US\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 3.4.2\n"
diff --git a/files/initrd/opt/rr/lang/ko.po b/files/initrd/opt/rr/lang/ko_KR.po
similarity index 99%
rename from files/initrd/opt/rr/lang/ko.po
rename to files/initrd/opt/rr/lang/ko_KR.po
index 4b2d1c1b..5a2ab59a 100644
--- a/files/initrd/opt/rr/lang/ko.po
+++ b/files/initrd/opt/rr/lang/ko_KR.po
@@ -1,4 +1,4 @@
-# Chinese translations for RR package.
+# Korean translations for RR package.
 # Copyright (C) 2023 THE RR'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the RR package.
 # EXP, 2023.
@@ -8,10 +8,10 @@ msgstr ""
 "Project-Id-Version: RR\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2024-01-12 11:12+0800\n"
-"PO-Revision-Date: 2024-01-13 12:49+0800\n"
+"PO-Revision-Date: 2024-01-13 23:09+0800\n"
 "Last-Translator: EXP\n"
 "Language-Team: 한국인 (대한민국) <EXP>\n"
-"Language: ko\n"
+"Language: ko_KR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -131,7 +131,7 @@ msgstr "경고, --noefi 매개 변수를 사용하여 kexec를 실행하면 오
 
 #: boot.sh:264
 msgid "Booting ..."
-msgstr "부팅중 ..."
+msgstr "부팅 중 ..."
 
 #: boot.sh:266
 msgid "[This interface will not be operational. Please wait a few minutes.\\nFind DSM via http://find.synology.com/ or Synology Assistant and connect.]"
@@ -303,7 +303,7 @@ msgstr "컴파일 중 ..."
 
 #: menu.sh:464 menu.sh:1233
 msgid "Error"
-msgstr "에러"
+msgstr "오류"
 
 #: menu.sh:497 menu.sh:514 menu.sh:519 menu.sh:525 menu.sh:536 menu.sh:544 menu.sh:567 menu.sh:574 menu.sh:578 menu.sh:592 menu.sh:596 menu.sh:604 menu.sh:607
 msgid "Addons"
@@ -655,7 +655,7 @@ msgstr "애드온 %s을 찾을 수 없습니다!"
 
 #: menu.sh:1224
 msgid "Cleaning ..."
-msgstr "청소 중..."
+msgstr "정리 중..."
 
 #: menu.sh:1226
 msgid "Ready!"
@@ -771,7 +771,7 @@ msgstr "글로벌 프록시 설정"
 
 #: menu.sh:1289
 msgid "Set github proxy"
-msgstr "깃허브 프록시 설정"
+msgstr "Github 프록시 설정"
 
 #: menu.sh:1292 menu.sh:1316 menu.sh:1328 menu.sh:1348 menu.sh:1371 menu.sh:1395 menu.sh:1400 menu.sh:1412 menu.sh:1421 menu.sh:1443 menu.sh:1544 menu.sh:1551 menu.sh:1569 menu.sh:1582 menu.sh:1585 menu.sh:1598 menu.sh:1602 menu.sh:1603 menu.sh:1608
 #: menu.sh:1612 menu.sh:1627 menu.sh:1629 menu.sh:1652 menu.sh:1656 menu.sh:1663 menu.sh:1669 menu.sh:1687 menu.sh:1689 menu.sh:1693 menu.sh:1707 menu.sh:1709 menu.sh:1713 menu.sh:1716 menu.sh:1731 menu.sh:1739 menu.sh:1743 menu.sh:1758 menu.sh:1763
@@ -869,7 +869,7 @@ msgstr "사용자 이름 선택"
 
 #: menu.sh:1664
 msgid "Type a new password for user '%s'"
-msgstr "사용자 '%s'의 새 비밀번호를 입력하세."
+msgstr "사용자 '%s'의 새 비밀번호를 입력하세요."
 
 #: menu.sh:1670
 msgid "Invalid password"
@@ -1201,7 +1201,7 @@ msgstr "버전 선택"
 
 #: menu.sh:2448
 msgid "Parse pat"
-msgstr "분석하다 pat"
+msgstr "Parse pat"
 
 #: menu.sh:2450
 msgid "Addons menu"
diff --git a/files/initrd/opt/rr/lang/rr.pot b/files/initrd/opt/rr/lang/rr.pot
index e68aa90e..eba4370b 100644
--- a/files/initrd/opt/rr/lang/rr.pot
+++ b/files/initrd/opt/rr/lang/rr.pot
@@ -6,16 +6,16 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-01-12 11:12+0800\n"
+"POT-Creation-Date: 2024-01-13 23:13+0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 3.4.2\n"
 
 #: boot.sh:8 init.sh:9 menu.sh:9
 msgid "Loader is not init!"
@@ -34,9 +34,7 @@ msgid "DSM zImage changed"
 msgstr ""
 
 #: boot.sh:36 menu.sh:1214
-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 ""
 
 #: boot.sh:45
@@ -44,9 +42,7 @@ msgid "DSM Ramdisk changed"
 msgstr ""
 
 #: boot.sh:48 menu.sh:1220
-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 ""
 
 #: boot.sh:67
@@ -74,15 +70,11 @@ msgid "MEM:  "
 msgstr ""
 
 #: 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 ""
 
 #: 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 ""
 
 #: boot.sh:166
@@ -142,9 +134,7 @@ msgid "Booting ..."
 msgstr ""
 
 #: boot.sh:266
-msgid ""
-"[This interface will not be operational. Please wait a few minutes.\\nFind "
-"DSM via http://find.synology.com/ or Synology Assistant and connect.]"
+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 ""
 
 #: init.sh:23
@@ -172,9 +162,7 @@ msgid "Waiting IP."
 msgstr ""
 
 #: init.sh:160
-msgid ""
-"Access \\033[1;34mhttp://%s:7681\\033[0m to configure the loader via web "
-"terminal."
+msgid "Access \\033[1;34mhttp://%s:7681\\033[0m to configure the loader via web terminal."
 msgstr ""
 
 #: init.sh:170
@@ -202,9 +190,7 @@ msgid "Default SSH Root password is"
 msgstr ""
 
 #: init.sh:191
-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 ""
 
 #: menu.sh:100 menu.sh:134 menu.sh:177
@@ -231,8 +217,7 @@ msgstr ""
 msgid "Choose the model"
 msgstr ""
 
-#: menu.sh:227 menu.sh:238 menu.sh:244 menu.sh:255 menu.sh:281 menu.sh:301
-#: menu.sh:351
+#: menu.sh:227 menu.sh:238 menu.sh:244 menu.sh:255 menu.sh:281 menu.sh:301 menu.sh:351
 msgid "Product Version"
 msgstr ""
 
@@ -241,14 +226,11 @@ msgid "Choose a product version"
 msgstr ""
 
 #: menu.sh:239
-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 ""
 
 #: menu.sh:245
-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 ""
 
 #: menu.sh:256
@@ -256,9 +238,7 @@ msgid "Get pat data ..."
 msgstr ""
 
 #: menu.sh:275
-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 ""
 
 #: menu.sh:279
@@ -274,9 +254,7 @@ msgid "Reconfiguring Synoinfo, Addons and Modules"
 msgstr ""
 
 #: menu.sh:336
-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 ""
 
 #: menu.sh:337
@@ -288,13 +266,10 @@ msgid "No pat file found in users folder!\\n"
 msgstr ""
 
 #: menu.sh:346
-msgid ""
-"Please upload the pat file to /mnt/p3/users/ folder via DUFS and re-enter "
-"this option.\\n"
+msgid "Please upload the pat file to /mnt/p3/users/ folder via DUFS and re-enter this option.\\n"
 msgstr ""
 
-#: menu.sh:347 menu.sh:357 menu.sh:2293 menu.sh:2357 menu.sh:2367 menu.sh:2384
-#: menu.sh:2404
+#: menu.sh:347 menu.sh:357 menu.sh:2293 menu.sh:2357 menu.sh:2367 menu.sh:2384 menu.sh:2404
 msgid "Update"
 msgstr ""
 
@@ -330,9 +305,7 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-#: menu.sh:497 menu.sh:514 menu.sh:519 menu.sh:525 menu.sh:536 menu.sh:544
-#: menu.sh:567 menu.sh:574 menu.sh:578 menu.sh:592 menu.sh:596 menu.sh:604
-#: menu.sh:607
+#: menu.sh:497 menu.sh:514 menu.sh:519 menu.sh:525 menu.sh:536 menu.sh:544 menu.sh:567 menu.sh:574 menu.sh:578 menu.sh:592 menu.sh:596 menu.sh:604 menu.sh:607
 msgid "Addons"
 msgstr ""
 
@@ -356,8 +329,7 @@ msgstr ""
 msgid "Upload a external addon"
 msgstr ""
 
-#: menu.sh:503 menu.sh:634 menu.sh:781 menu.sh:915 menu.sh:1290 menu.sh:2291
-#: menu.sh:2471 menu.sh:2547
+#: menu.sh:503 menu.sh:634 menu.sh:781 menu.sh:915 menu.sh:1290 menu.sh:2291 menu.sh:2471 menu.sh:2547
 msgid "Exit"
 msgstr ""
 
@@ -382,15 +354,11 @@ msgid "Select addon to remove"
 msgstr ""
 
 #: menu.sh:558
-msgid ""
-"Name with color \"\\Z4blue\\Zn\" have been added, with color \"black\" are "
-"not added.\\n\\n"
+msgid "Name with color \"\\Z4blue\\Zn\" have been added, with color \"black\" are not added.\\n\\n"
 msgstr ""
 
 #: menu.sh:573 menu.sh:706 menu.sh:1737 menu.sh:2355
-msgid ""
-"This feature is only available when accessed via ssh (Requires a terminal "
-"that supports ZModem protocol).\\n"
+msgid "This feature is only available when accessed via ssh (Requires a terminal that supports ZModem protocol).\\n"
 msgstr ""
 
 #: menu.sh:579
@@ -413,8 +381,7 @@ msgstr ""
 msgid "File format not recognized!"
 msgstr ""
 
-#: menu.sh:627 menu.sh:640 menu.sh:653 menu.sh:690 menu.sh:707 menu.sh:717
-#: menu.sh:720 menu.sh:736 menu.sh:740
+#: menu.sh:627 menu.sh:640 menu.sh:653 menu.sh:690 menu.sh:707 menu.sh:717 menu.sh:720 menu.sh:736 menu.sh:740
 msgid "Modules"
 msgstr ""
 
@@ -459,27 +426,19 @@ msgid "Selecting loaded modules"
 msgstr ""
 
 #: menu.sh:712
-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 ""
 
 #: menu.sh:713
-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 ""
 
 #: menu.sh:714
-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"
+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 ""
 
 #: menu.sh:715
-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"
+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 ""
 
 #: menu.sh:716
@@ -514,8 +473,7 @@ msgstr ""
 msgid "Show model inherent cmdline"
 msgstr ""
 
-#: menu.sh:782 menu.sh:800 menu.sh:809 menu.sh:833 menu.sh:841 menu.sh:858
-#: menu.sh:869 menu.sh:901
+#: menu.sh:782 menu.sh:800 menu.sh:809 menu.sh:833 menu.sh:841 menu.sh:858 menu.sh:869 menu.sh:901
 msgid "Cmdline"
 msgstr ""
 
@@ -524,15 +482,11 @@ msgid "Commonly used cmdlines:\\n"
 msgstr ""
 
 #: menu.sh:790
-msgid ""
-" * \\Z4disable_mtrr_trim=\\Zn\\n    disables kernel trim any uncacheable "
-"memory out.\\n"
+msgid " * \\Z4disable_mtrr_trim=\\Zn\\n    disables kernel trim any uncacheable memory out.\\n"
 msgstr ""
 
 #: menu.sh:791
-msgid ""
-" * \\Z4intel_idle.max_cstate=1\\Zn\\n    Set the maximum C-state depth "
-"allowed by the intel_idle driver.\\n"
+msgid " * \\Z4intel_idle.max_cstate=1\\Zn\\n    Set the maximum C-state depth allowed by the intel_idle driver.\\n"
 msgstr ""
 
 #: menu.sh:792
@@ -544,20 +498,15 @@ msgid " * \\Z4SataPortMap=??\\Zn\\n    Sata Port Map.\\n"
 msgstr ""
 
 #: menu.sh:794
-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 ""
 
 #: menu.sh:795
-msgid ""
-" * \\Z4i915.enable_guc=2\\Zn\\n    Enable the GuC firmware on Intel graphics "
-"hardware.(value: 1,2 or 3)\\n"
+msgid " * \\Z4i915.enable_guc=2\\Zn\\n    Enable the GuC firmware on Intel graphics hardware.(value: 1,2 or 3)\\n"
 msgstr ""
 
 #: menu.sh:796
-msgid ""
-" * \\Z4i915.max_vfs=7\\Zn\\n     Set the maximum number of virtual functions "
-"(VFs) that can be created for Intel graphics hardware.\\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 ""
 
 #: menu.sh:797 menu.sh:928
@@ -649,9 +598,7 @@ msgid "Encrypted"
 msgstr ""
 
 #: menu.sh:1061
-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 ""
 
 #: menu.sh:1068 menu.sh:1160
@@ -675,8 +622,7 @@ msgid "Cleaning cache ..."
 msgstr ""
 
 #: menu.sh:1130
-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 ""
 
 #: menu.sh:1133
@@ -688,9 +634,7 @@ msgid "Checking hash of %s: "
 msgstr ""
 
 #: menu.sh:1153
-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 ""
 
 #: menu.sh:1156 menu.sh:1172 menu.sh:1182
@@ -829,17 +773,9 @@ msgstr ""
 msgid "Set github proxy"
 msgstr ""
 
-#: menu.sh:1292 menu.sh:1316 menu.sh:1328 menu.sh:1348 menu.sh:1371
-#: menu.sh:1395 menu.sh:1400 menu.sh:1412 menu.sh:1421 menu.sh:1443
-#: menu.sh:1544 menu.sh:1551 menu.sh:1569 menu.sh:1582 menu.sh:1585
-#: menu.sh:1598 menu.sh:1602 menu.sh:1603 menu.sh:1608 menu.sh:1612
-#: menu.sh:1627 menu.sh:1629 menu.sh:1652 menu.sh:1656 menu.sh:1663
-#: menu.sh:1669 menu.sh:1687 menu.sh:1689 menu.sh:1693 menu.sh:1707
-#: menu.sh:1709 menu.sh:1713 menu.sh:1716 menu.sh:1731 menu.sh:1739
-#: menu.sh:1743 menu.sh:1758 menu.sh:1763 menu.sh:1774 menu.sh:1806
-#: menu.sh:1810 menu.sh:1816 menu.sh:1822 menu.sh:1828 menu.sh:1859
-#: menu.sh:1872 menu.sh:1876 menu.sh:1886 menu.sh:1891 menu.sh:1898
-#: menu.sh:1900 menu.sh:1912 menu.sh:1923 menu.sh:1945 menu.sh:1956
+#: menu.sh:1292 menu.sh:1316 menu.sh:1328 menu.sh:1348 menu.sh:1371 menu.sh:1395 menu.sh:1400 menu.sh:1412 menu.sh:1421 menu.sh:1443 menu.sh:1544 menu.sh:1551 menu.sh:1569 menu.sh:1582 menu.sh:1585 menu.sh:1598 menu.sh:1602 menu.sh:1603 menu.sh:1608
+#: menu.sh:1612 menu.sh:1627 menu.sh:1629 menu.sh:1652 menu.sh:1656 menu.sh:1663 menu.sh:1669 menu.sh:1687 menu.sh:1689 menu.sh:1693 menu.sh:1707 menu.sh:1709 menu.sh:1713 menu.sh:1716 menu.sh:1731 menu.sh:1739 menu.sh:1743 menu.sh:1758 menu.sh:1763
+#: menu.sh:1774 menu.sh:1806 menu.sh:1810 menu.sh:1816 menu.sh:1822 menu.sh:1828 menu.sh:1859 menu.sh:1872 menu.sh:1876 menu.sh:1886 menu.sh:1891 menu.sh:1898 menu.sh:1900 menu.sh:1912 menu.sh:1923 menu.sh:1945 menu.sh:1956
 msgid "Advanced"
 msgstr ""
 
@@ -880,9 +816,7 @@ msgid "\\nTotal of ports: %s\\n"
 msgstr ""
 
 #: menu.sh:1543
-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 ""
 
 #: menu.sh:1550
@@ -890,9 +824,7 @@ msgid "pat: (editable)"
 msgstr ""
 
 #: menu.sh:1566
-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 ""
 
 #: menu.sh:1567
@@ -900,9 +832,7 @@ msgid "Therefore, please insert all disks before continuing.\\n"
 msgstr ""
 
 #: menu.sh:1568 menu.sh:1609
-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 ""
 
 #: menu.sh:1583
@@ -918,8 +848,7 @@ msgid "No disk found!"
 msgstr ""
 
 #: menu.sh:1613
-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 ""
 
 #: menu.sh:1628
@@ -967,14 +896,11 @@ msgid "Telnet is enabled."
 msgstr ""
 
 #: menu.sh:1714
-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 ""
 
 #: menu.sh:1717
-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 ""
 
 #: menu.sh:1732
@@ -982,15 +908,11 @@ msgid "Save is complete."
 msgstr ""
 
 #: menu.sh:1738
-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 ""
 
 #: menu.sh:1744
-msgid ""
-"Currently, only dts format files are supported. Please prepare and click to "
-"confirm uploading.\\n(saved in /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 ""
 
 #: menu.sh:1759
@@ -1030,9 +952,7 @@ msgid "Disk %s size is less than 1GB and cannot be cloned!"
 msgstr ""
 
 #: menu.sh:1827
-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?"
+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 ""
 
 #: menu.sh:1860
@@ -1040,15 +960,11 @@ msgid "Cloning ..."
 msgstr ""
 
 #: menu.sh:1862
-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 ""
 
 #: menu.sh:1873
-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 ""
 
 #: menu.sh:1877
@@ -1076,9 +992,7 @@ msgid " 3. Reboot into RR and go to this option.\\n"
 msgstr ""
 
 #: menu.sh:1892
-msgid ""
-"This option only installs opkg package management, allowing you to install "
-"more tools for use and debugging. Do you want to continue?"
+msgid "This option only installs opkg package management, allowing you to install more tools for use and debugging. Do you want to continue?"
 msgstr ""
 
 #: menu.sh:1899
@@ -1086,9 +1000,7 @@ msgid "opkg installing ..."
 msgstr ""
 
 #: menu.sh:1901
-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 ""
 
 #: menu.sh:1913
@@ -1143,9 +1055,7 @@ msgstr ""
 msgid "Choice a keymap"
 msgstr ""
 
-#: menu.sh:2128 menu.sh:2181 menu.sh:2232 menu.sh:2299 menu.sh:2304
-#: menu.sh:2309 menu.sh:2314 menu.sh:2321 menu.sh:2329 menu.sh:2337
-#: menu.sh:2345
+#: menu.sh:2128 menu.sh:2181 menu.sh:2232 menu.sh:2299 menu.sh:2304 menu.sh:2309 menu.sh:2314 menu.sh:2321 menu.sh:2329 menu.sh:2337 menu.sh:2345
 msgid "Update %s"
 msgstr ""
 
@@ -1186,9 +1096,7 @@ msgid "Checksum do not match!"
 msgstr ""
 
 #: menu.sh:2203
-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 ""
 
 #: menu.sh:2208
@@ -1236,9 +1144,7 @@ msgid "Pre Release:"
 msgstr ""
 
 #: menu.sh:2294
-msgid ""
-"Manually uploading update.zip,addons.zip,modules.zip,rp-lkms.zip to /tmp/ "
-"will skip the download."
+msgid "Manually uploading update.zip,addons.zip,modules.zip,rp-lkms.zip to /tmp/ will skip the download."
 msgstr ""
 
 #: menu.sh:2299 menu.sh:2329
@@ -1258,15 +1164,11 @@ msgid "RR"
 msgstr ""
 
 #: menu.sh:2356
-msgid ""
-"Or upload update.zip, addons.zip, modules.zip, rp-lkms.zip to /tmp/ via DUFS "
-"will skip the download.\\n"
+msgid "Or upload update.zip, addons.zip, modules.zip, rp-lkms.zip to /tmp/ via DUFS will skip the download.\\n"
 msgstr ""
 
 #: menu.sh:2362
-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 ""
 
 #: menu.sh:2363
diff --git a/files/initrd/opt/rr/lang/ru.po b/files/initrd/opt/rr/lang/ru_RU.po
similarity index 99%
rename from files/initrd/opt/rr/lang/ru.po
rename to files/initrd/opt/rr/lang/ru_RU.po
index d7c7c2c4..471aa5cc 100644
--- a/files/initrd/opt/rr/lang/ru.po
+++ b/files/initrd/opt/rr/lang/ru_RU.po
@@ -8,10 +8,10 @@ msgstr ""
 "Project-Id-Version: RR\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2024-01-12 11:12+0800\n"
-"PO-Revision-Date: 2024-01-13 12:49+0800\n"
+"PO-Revision-Date: 2024-01-13 23:09+0800\n"
 "Last-Translator: Alex TG @xpenology_russian\n"
 "Language-Team: Русский перевод TG @xpenology_russian\n"
-"Language: ru\n"
+"Language: ru_RU\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -27,7 +27,7 @@ msgstr "Загрузчик не настроен!"
 
 #: boot.sh:20 init.sh:14
 msgid "Welcome to %s"
-msgstr "Добро пожаловать в %s"
+msgstr "Welcome to %s"
 
 #: boot.sh:33
 msgid "DSM zImage changed"
diff --git a/files/initrd/opt/rr/menu.sh b/files/initrd/opt/rr/menu.sh
index 0d8ed2ef..d97ac4c7 100755
--- a/files/initrd/opt/rr/menu.sh
+++ b/files/initrd/opt/rr/menu.sh
@@ -2078,7 +2078,7 @@ function boot() {
 ###############################################################################
 # Shows language to user choose one
 function languageMenu() {
-  ITEMS="$(ls /usr/share/locale 2>/dev/null)"
+  ITEMS="$(ls ${WORK_PATH}/lang/*.mo 2>/dev/null | sort | sed -r 's/.*\/(.*)\.mo$/\1/')"
   DIALOG \
     --default-item "${LAYOUT}" --no-items --menu "$(TEXT "Choose a language")" 0 0 0 ${ITEMS} 2>${TMP_PATH}/resp
   [ $? -ne 0 ] && return
@@ -2086,7 +2086,7 @@ function languageMenu() {
   [ -z "${resp}" ] && return
   LANGUAGE=${resp}
   echo "${LANGUAGE}.UTF-8" >${PART1_PATH}/.locale
-  export LANG="${LANGUAGE}.UTF-8"
+  export LC_ALL="${LANGUAGE}.UTF-8"
 }
 
 ###############################################################################