diff options
-rw-r--r-- | apps/lang/dansk.lang | 4 | ||||
-rw-r--r-- | apps/lang/deutsch.lang | 4 | ||||
-rw-r--r-- | apps/lang/english.lang | 8 | ||||
-rw-r--r-- | apps/lang/finnish.lang | 4 | ||||
-rw-r--r-- | apps/lang/francais.lang | 4 | ||||
-rw-r--r-- | apps/lang/italiano.lang | 4 | ||||
-rw-r--r-- | apps/lang/japanese.lang | 6 | ||||
-rw-r--r-- | apps/lang/korean.lang | 4 | ||||
-rw-r--r-- | apps/lang/magyar.lang | 4 | ||||
-rw-r--r-- | apps/lang/nederlands.lang | 6 | ||||
-rw-r--r-- | apps/lang/norsk.lang | 4 | ||||
-rw-r--r-- | apps/lang/portugues.lang | 4 | ||||
-rw-r--r-- | apps/lang/russian.lang | 4 | ||||
-rw-r--r-- | apps/lang/svenska.lang | 4 | ||||
-rw-r--r-- | apps/settings_menu.c | 2 | ||||
-rw-r--r-- | firmware/common/unicode.c | 2 | ||||
-rw-r--r-- | tools/codepages.c | 2 |
17 files changed, 35 insertions, 35 deletions
diff --git a/apps/lang/dansk.lang b/apps/lang/dansk.lang index 4e56e8830e..26eeb82d61 100644 --- a/apps/lang/dansk.lang +++ b/apps/lang/dansk.lang | |||
@@ -1777,11 +1777,11 @@ | |||
1777 | </voice> | 1777 | </voice> |
1778 | </phrase> | 1778 | </phrase> |
1779 | <phrase> | 1779 | <phrase> |
1780 | id: LANG_CODEPAGE_RUSSIAN | 1780 | id: LANG_CODEPAGE_CYRILLIC |
1781 | desc: in codepage setting menu | 1781 | desc: in codepage setting menu |
1782 | user: | 1782 | user: |
1783 | <source> | 1783 | <source> |
1784 | *: "Russian (CP1251)" | 1784 | *: "Cyrillic (CP1251)" |
1785 | </source> | 1785 | </source> |
1786 | <dest> | 1786 | <dest> |
1787 | *: "Russisk (CP1251)" | 1787 | *: "Russisk (CP1251)" |
diff --git a/apps/lang/deutsch.lang b/apps/lang/deutsch.lang index b89878fad7..ab7c6c6b95 100644 --- a/apps/lang/deutsch.lang +++ b/apps/lang/deutsch.lang | |||
@@ -2127,11 +2127,11 @@ | |||
2127 | </voice> | 2127 | </voice> |
2128 | </phrase> | 2128 | </phrase> |
2129 | <phrase> | 2129 | <phrase> |
2130 | id: LANG_CODEPAGE_RUSSIAN | 2130 | id: LANG_CODEPAGE_CYRILLIC |
2131 | desc: in codepage setting menu | 2131 | desc: in codepage setting menu |
2132 | user: | 2132 | user: |
2133 | <source> | 2133 | <source> |
2134 | *: "Russian (CP1251)" | 2134 | *: "Cyrillic (CP1251)" |
2135 | </source> | 2135 | </source> |
2136 | <dest> | 2136 | <dest> |
2137 | *: "Russisch (CP1251)" | 2137 | *: "Russisch (CP1251)" |
diff --git a/apps/lang/english.lang b/apps/lang/english.lang index d0409e3a7e..870c27b7ab 100644 --- a/apps/lang/english.lang +++ b/apps/lang/english.lang | |||
@@ -2151,17 +2151,17 @@ | |||
2151 | </voice> | 2151 | </voice> |
2152 | </phrase> | 2152 | </phrase> |
2153 | <phrase> | 2153 | <phrase> |
2154 | id: LANG_CODEPAGE_RUSSIAN | 2154 | id: LANG_CODEPAGE_CYRILLIC |
2155 | desc: in codepage setting menu | 2155 | desc: in codepage setting menu |
2156 | user: | 2156 | user: |
2157 | <source> | 2157 | <source> |
2158 | *: "Russian (CP1251)" | 2158 | *: "Cyrillic (CP1251)" |
2159 | </source> | 2159 | </source> |
2160 | <dest> | 2160 | <dest> |
2161 | *: "Russian (CP1251)" | 2161 | *: "Cyrillic (CP1251)" |
2162 | </dest> | 2162 | </dest> |
2163 | <voice> | 2163 | <voice> |
2164 | *: "Russian" | 2164 | *: "Cyrillic" |
2165 | </voice> | 2165 | </voice> |
2166 | </phrase> | 2166 | </phrase> |
2167 | <phrase> | 2167 | <phrase> |
diff --git a/apps/lang/finnish.lang b/apps/lang/finnish.lang index e4a94ea6a6..42ee841e61 100644 --- a/apps/lang/finnish.lang +++ b/apps/lang/finnish.lang | |||
@@ -2113,11 +2113,11 @@ | |||
2113 | </voice> | 2113 | </voice> |
2114 | </phrase> | 2114 | </phrase> |
2115 | <phrase> | 2115 | <phrase> |
2116 | id: LANG_CODEPAGE_RUSSIAN | 2116 | id: LANG_CODEPAGE_CYRILLIC |
2117 | desc: in codepage setting menu | 2117 | desc: in codepage setting menu |
2118 | user: | 2118 | user: |
2119 | <source> | 2119 | <source> |
2120 | *: "Russian (CP1251)" | 2120 | *: "Cyrillic (CP1251)" |
2121 | </source> | 2121 | </source> |
2122 | <dest> | 2122 | <dest> |
2123 | *: "Venäläinen (CP1251)" | 2123 | *: "Venäläinen (CP1251)" |
diff --git a/apps/lang/francais.lang b/apps/lang/francais.lang index fb109780ce..100679a6a1 100644 --- a/apps/lang/francais.lang +++ b/apps/lang/francais.lang | |||
@@ -2029,11 +2029,11 @@ | |||
2029 | </voice> | 2029 | </voice> |
2030 | </phrase> | 2030 | </phrase> |
2031 | <phrase> | 2031 | <phrase> |
2032 | id: LANG_CODEPAGE_RUSSIAN | 2032 | id: LANG_CODEPAGE_CYRILLIC |
2033 | desc: in codepage setting menu | 2033 | desc: in codepage setting menu |
2034 | user: | 2034 | user: |
2035 | <source> | 2035 | <source> |
2036 | *: "Russian (CP1251)" | 2036 | *: "Cyrillic (CP1251)" |
2037 | </source> | 2037 | </source> |
2038 | <dest> | 2038 | <dest> |
2039 | *: "Russe (CP1251)" | 2039 | *: "Russe (CP1251)" |
diff --git a/apps/lang/italiano.lang b/apps/lang/italiano.lang index d6ea2669a9..fa9ba7e8b7 100644 --- a/apps/lang/italiano.lang +++ b/apps/lang/italiano.lang | |||
@@ -2015,11 +2015,11 @@ | |||
2015 | </voice> | 2015 | </voice> |
2016 | </phrase> | 2016 | </phrase> |
2017 | <phrase> | 2017 | <phrase> |
2018 | id: LANG_CODEPAGE_RUSSIAN | 2018 | id: LANG_CODEPAGE_CYRILLIC |
2019 | desc: in codepage setting menu | 2019 | desc: in codepage setting menu |
2020 | user: | 2020 | user: |
2021 | <source> | 2021 | <source> |
2022 | *: "Russian (CP1251)" | 2022 | *: "Cyrillic (CP1251)" |
2023 | </source> | 2023 | </source> |
2024 | <dest> | 2024 | <dest> |
2025 | *: "Russo (CP1251)" | 2025 | *: "Russo (CP1251)" |
diff --git a/apps/lang/japanese.lang b/apps/lang/japanese.lang index 8f5bfae5ef..c4a7bfeb9b 100644 --- a/apps/lang/japanese.lang +++ b/apps/lang/japanese.lang | |||
@@ -2015,14 +2015,14 @@ | |||
2015 | </voice> | 2015 | </voice> |
2016 | </phrase> | 2016 | </phrase> |
2017 | <phrase> | 2017 | <phrase> |
2018 | id: LANG_CODEPAGE_RUSSIAN | 2018 | id: LANG_CODEPAGE_CYRILLIC |
2019 | desc: in codepage setting menu | 2019 | desc: in codepage setting menu |
2020 | user: | 2020 | user: |
2021 | <source> | 2021 | <source> |
2022 | *: "Russian (CP1251)" | 2022 | *: "Cyrillic (CP1251)" |
2023 | </source> | 2023 | </source> |
2024 | <dest> | 2024 | <dest> |
2025 | *: "Russian (CP1251)" | 2025 | *: "Cyrillic (CP1251)" |
2026 | </dest> | 2026 | </dest> |
2027 | <voice> | 2027 | <voice> |
2028 | *: "" | 2028 | *: "" |
diff --git a/apps/lang/korean.lang b/apps/lang/korean.lang index c82a98b8c6..fffeca0d37 100644 --- a/apps/lang/korean.lang +++ b/apps/lang/korean.lang | |||
@@ -2029,11 +2029,11 @@ | |||
2029 | </voice> | 2029 | </voice> |
2030 | </phrase> | 2030 | </phrase> |
2031 | <phrase> | 2031 | <phrase> |
2032 | id: LANG_CODEPAGE_RUSSIAN | 2032 | id: LANG_CODEPAGE_CYRILLIC |
2033 | desc: in codepage setting menu | 2033 | desc: in codepage setting menu |
2034 | user: | 2034 | user: |
2035 | <source> | 2035 | <source> |
2036 | *: "Russian (CP1251)" | 2036 | *: "Cyrillic (CP1251)" |
2037 | </source> | 2037 | </source> |
2038 | <dest> | 2038 | <dest> |
2039 | *: "러시아어 (CP1251)" | 2039 | *: "러시아어 (CP1251)" |
diff --git a/apps/lang/magyar.lang b/apps/lang/magyar.lang index c79b88cdfb..92db65542c 100644 --- a/apps/lang/magyar.lang +++ b/apps/lang/magyar.lang | |||
@@ -2015,11 +2015,11 @@ | |||
2015 | </voice> | 2015 | </voice> |
2016 | </phrase> | 2016 | </phrase> |
2017 | <phrase> | 2017 | <phrase> |
2018 | id: LANG_CODEPAGE_RUSSIAN | 2018 | id: LANG_CODEPAGE_CYRILLIC |
2019 | desc: in codepage setting menu | 2019 | desc: in codepage setting menu |
2020 | user: | 2020 | user: |
2021 | <source> | 2021 | <source> |
2022 | *: "Russian (CP1251)" | 2022 | *: "Cyrillic (CP1251)" |
2023 | </source> | 2023 | </source> |
2024 | <dest> | 2024 | <dest> |
2025 | *: "Orosz (CP1251)" | 2025 | *: "Orosz (CP1251)" |
diff --git a/apps/lang/nederlands.lang b/apps/lang/nederlands.lang index a0765c45cf..12c04ee270 100644 --- a/apps/lang/nederlands.lang +++ b/apps/lang/nederlands.lang | |||
@@ -2015,14 +2015,14 @@ | |||
2015 | </voice> | 2015 | </voice> |
2016 | </phrase> | 2016 | </phrase> |
2017 | <phrase> | 2017 | <phrase> |
2018 | id: LANG_CODEPAGE_RUSSIAN | 2018 | id: LANG_CODEPAGE_CYRILLIC |
2019 | desc: in codepage setting menu | 2019 | desc: in codepage setting menu |
2020 | user: | 2020 | user: |
2021 | <source> | 2021 | <source> |
2022 | *: "Russian (CP1251)" | 2022 | *: "Cyrillic (CP1251)" |
2023 | </source> | 2023 | </source> |
2024 | <dest> | 2024 | <dest> |
2025 | *: "Russian (CP1251)" | 2025 | *: "Cyrillic (CP1251)" |
2026 | </dest> | 2026 | </dest> |
2027 | <voice> | 2027 | <voice> |
2028 | *: "" | 2028 | *: "" |
diff --git a/apps/lang/norsk.lang b/apps/lang/norsk.lang index 90fa66ee16..2db6c71016 100644 --- a/apps/lang/norsk.lang +++ b/apps/lang/norsk.lang | |||
@@ -1777,11 +1777,11 @@ | |||
1777 | </voice> | 1777 | </voice> |
1778 | </phrase> | 1778 | </phrase> |
1779 | <phrase> | 1779 | <phrase> |
1780 | id: LANG_CODEPAGE_RUSSIAN | 1780 | id: LANG_CODEPAGE_CYRILLIC |
1781 | desc: in codepage setting menu | 1781 | desc: in codepage setting menu |
1782 | user: | 1782 | user: |
1783 | <source> | 1783 | <source> |
1784 | *: "Russian (CP1251)" | 1784 | *: "Cyrillic (CP1251)" |
1785 | </source> | 1785 | </source> |
1786 | <dest> | 1786 | <dest> |
1787 | *: "Russisk (CP1251)" | 1787 | *: "Russisk (CP1251)" |
diff --git a/apps/lang/portugues.lang b/apps/lang/portugues.lang index 09c8b4fbde..9c7f4f4b0b 100644 --- a/apps/lang/portugues.lang +++ b/apps/lang/portugues.lang | |||
@@ -2015,11 +2015,11 @@ | |||
2015 | </voice> | 2015 | </voice> |
2016 | </phrase> | 2016 | </phrase> |
2017 | <phrase> | 2017 | <phrase> |
2018 | id: LANG_CODEPAGE_RUSSIAN | 2018 | id: LANG_CODEPAGE_CYRILLIC |
2019 | desc: in codepage setting menu | 2019 | desc: in codepage setting menu |
2020 | user: | 2020 | user: |
2021 | <source> | 2021 | <source> |
2022 | *: "Russian (CP1251)" | 2022 | *: "Cyrillic (CP1251)" |
2023 | </source> | 2023 | </source> |
2024 | <dest> | 2024 | <dest> |
2025 | *: "Russo (CP1251)" | 2025 | *: "Russo (CP1251)" |
diff --git a/apps/lang/russian.lang b/apps/lang/russian.lang index f445d8e0a4..edfd56aa3a 100644 --- a/apps/lang/russian.lang +++ b/apps/lang/russian.lang | |||
@@ -2015,11 +2015,11 @@ | |||
2015 | </voice> | 2015 | </voice> |
2016 | </phrase> | 2016 | </phrase> |
2017 | <phrase> | 2017 | <phrase> |
2018 | id: LANG_CODEPAGE_RUSSIAN | 2018 | id: LANG_CODEPAGE_CYRILLIC |
2019 | desc: in codepage setting menu | 2019 | desc: in codepage setting menu |
2020 | user: | 2020 | user: |
2021 | <source> | 2021 | <source> |
2022 | *: "Russian (CP1251)" | 2022 | *: "Cyrillic (CP1251)" |
2023 | </source> | 2023 | </source> |
2024 | <dest> | 2024 | <dest> |
2025 | *: "Русская (CP1251)" | 2025 | *: "Русская (CP1251)" |
diff --git a/apps/lang/svenska.lang b/apps/lang/svenska.lang index bb13f44493..544556d0a1 100644 --- a/apps/lang/svenska.lang +++ b/apps/lang/svenska.lang | |||
@@ -2127,11 +2127,11 @@ | |||
2127 | </voice> | 2127 | </voice> |
2128 | </phrase> | 2128 | </phrase> |
2129 | <phrase> | 2129 | <phrase> |
2130 | id: LANG_CODEPAGE_RUSSIAN | 2130 | id: LANG_CODEPAGE_CYRILLIC |
2131 | desc: in codepage setting menu | 2131 | desc: in codepage setting menu |
2132 | user: | 2132 | user: |
2133 | <source> | 2133 | <source> |
2134 | *: "Russian (CP1251)" | 2134 | *: "Cyrillic (CP1251)" |
2135 | </source> | 2135 | </source> |
2136 | <dest> | 2136 | <dest> |
2137 | *: "Ryska (CP1251)" | 2137 | *: "Ryska (CP1251)" |
diff --git a/apps/settings_menu.c b/apps/settings_menu.c index 9dd215da27..987994a41b 100644 --- a/apps/settings_menu.c +++ b/apps/settings_menu.c | |||
@@ -1283,7 +1283,7 @@ static bool codepage_setting(void) | |||
1283 | { STR(LANG_CODEPAGE_LATIN1) }, | 1283 | { STR(LANG_CODEPAGE_LATIN1) }, |
1284 | { STR(LANG_CODEPAGE_GREEK) }, | 1284 | { STR(LANG_CODEPAGE_GREEK) }, |
1285 | { STR(LANG_CODEPAGE_HEBREW) }, | 1285 | { STR(LANG_CODEPAGE_HEBREW) }, |
1286 | { STR(LANG_CODEPAGE_RUSSIAN) }, | 1286 | { STR(LANG_CODEPAGE_CYRILLIC) }, |
1287 | { STR(LANG_CODEPAGE_THAI) }, | 1287 | { STR(LANG_CODEPAGE_THAI) }, |
1288 | { STR(LANG_CODEPAGE_ARABIC) }, | 1288 | { STR(LANG_CODEPAGE_ARABIC) }, |
1289 | { STR(LANG_CODEPAGE_TURKISH) }, | 1289 | { STR(LANG_CODEPAGE_TURKISH) }, |
diff --git a/firmware/common/unicode.c b/firmware/common/unicode.c index e04c7cf1e6..75165e49c7 100644 --- a/firmware/common/unicode.c +++ b/firmware/common/unicode.c | |||
@@ -123,7 +123,7 @@ unsigned char* iso_decode(const unsigned char *iso, unsigned char *utf8, | |||
123 | switch (cp) { | 123 | switch (cp) { |
124 | case 0x01: /* Greek (ISO-8859-7) */ | 124 | case 0x01: /* Greek (ISO-8859-7) */ |
125 | case 0x02: /* Hebrew (ISO-8859-8) */ | 125 | case 0x02: /* Hebrew (ISO-8859-8) */ |
126 | case 0x03: /* Russian (CP1251) */ | 126 | case 0x03: /* Cyrillic (CP1251) */ |
127 | case 0x04: /* Thai (ISO-8859-11) */ | 127 | case 0x04: /* Thai (ISO-8859-11) */ |
128 | case 0x05: /* Arabic (CP1256) */ | 128 | case 0x05: /* Arabic (CP1256) */ |
129 | case 0x06: /* Turkish (ISO-8859-9) */ | 129 | case 0x06: /* Turkish (ISO-8859-9) */ |
diff --git a/tools/codepages.c b/tools/codepages.c index 023a741e30..e19d39c85a 100644 --- a/tools/codepages.c +++ b/tools/codepages.c | |||
@@ -62,7 +62,7 @@ unsigned short iso_decode(unsigned char *latin1, int cp, int count) | |||
62 | } | 62 | } |
63 | break; | 63 | break; |
64 | 64 | ||
65 | case 0x03: /* Russian (CP1251) */ | 65 | case 0x03: /* Cyrillic (CP1251) */ |
66 | while (count--) { | 66 | while (count--) { |
67 | /* first convert to unicode */ | 67 | /* first convert to unicode */ |
68 | if (*latin1 < 0x80) | 68 | if (*latin1 < 0x80) |