CP1251 is cyrillic, and not only russian codepage

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@9518 a1c6a512-1295-4272-9138-f99709370657

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 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_CODEPAGE_RUSSIAN
+  id: LANG_CODEPAGE_CYRILLIC
   desc: in codepage setting menu
   user:
   <source>
-    *: "Russian (CP1251)"
+    *: "Cyrillic (CP1251)"
   </source>
   <dest>
     *: "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 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_CODEPAGE_RUSSIAN
+  id: LANG_CODEPAGE_CYRILLIC
   desc: in codepage setting menu
   user:
   <source>
-    *: "Russian (CP1251)"
+    *: "Cyrillic (CP1251)"
   </source>
   <dest>
     *: "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 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_CODEPAGE_RUSSIAN
+  id: LANG_CODEPAGE_CYRILLIC
   desc: in codepage setting menu
   user:
   <source>
-    *: "Russian (CP1251)"
+    *: "Cyrillic (CP1251)"
   </source>
   <dest>
-    *: "Russian (CP1251)"
+    *: "Cyrillic (CP1251)"
   </dest>
   <voice>
-    *: "Russian"
+    *: "Cyrillic"
   </voice>
 </phrase>
 <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 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_CODEPAGE_RUSSIAN
+  id: LANG_CODEPAGE_CYRILLIC
   desc: in codepage setting menu
   user:
   <source>
-    *: "Russian (CP1251)"
+    *: "Cyrillic (CP1251)"
   </source>
   <dest>
     *: "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 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_CODEPAGE_RUSSIAN
+  id: LANG_CODEPAGE_CYRILLIC
   desc: in codepage setting menu
   user:
   <source>
-    *: "Russian (CP1251)"
+    *: "Cyrillic (CP1251)"
   </source>
   <dest>
     *: "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 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_CODEPAGE_RUSSIAN
+  id: LANG_CODEPAGE_CYRILLIC
   desc: in codepage setting menu
   user:
   <source>
-    *: "Russian (CP1251)"
+    *: "Cyrillic (CP1251)"
   </source>
   <dest>
     *: "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 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_CODEPAGE_RUSSIAN
+  id: LANG_CODEPAGE_CYRILLIC
   desc: in codepage setting menu
   user:
   <source>
-    *: "Russian (CP1251)"
+    *: "Cyrillic (CP1251)"
   </source>
   <dest>
-    *: "Russian (CP1251)"
+    *: "Cyrillic (CP1251)"
   </dest>
   <voice>
     *: ""
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 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_CODEPAGE_RUSSIAN
+  id: LANG_CODEPAGE_CYRILLIC
   desc: in codepage setting menu
   user:
   <source>
-    *: "Russian (CP1251)"
+    *: "Cyrillic (CP1251)"
   </source>
   <dest>
     *: "러시아어 (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 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_CODEPAGE_RUSSIAN
+  id: LANG_CODEPAGE_CYRILLIC
   desc: in codepage setting menu
   user:
   <source>
-    *: "Russian (CP1251)"
+    *: "Cyrillic (CP1251)"
   </source>
   <dest>
     *: "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 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_CODEPAGE_RUSSIAN
+  id: LANG_CODEPAGE_CYRILLIC
   desc: in codepage setting menu
   user:
   <source>
-    *: "Russian (CP1251)"
+    *: "Cyrillic (CP1251)"
   </source>
   <dest>
-    *: "Russian (CP1251)"
+    *: "Cyrillic (CP1251)"
   </dest>
   <voice>
     *: ""
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 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_CODEPAGE_RUSSIAN
+  id: LANG_CODEPAGE_CYRILLIC
   desc: in codepage setting menu
   user:
   <source>
-    *: "Russian (CP1251)"
+    *: "Cyrillic (CP1251)"
   </source>
   <dest>
     *: "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 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_CODEPAGE_RUSSIAN
+  id: LANG_CODEPAGE_CYRILLIC
   desc: in codepage setting menu
   user:
   <source>
-    *: "Russian (CP1251)"
+    *: "Cyrillic (CP1251)"
   </source>
   <dest>
     *: "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 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_CODEPAGE_RUSSIAN
+  id: LANG_CODEPAGE_CYRILLIC
   desc: in codepage setting menu
   user:
   <source>
-    *: "Russian (CP1251)"
+    *: "Cyrillic (CP1251)"
   </source>
   <dest>
     *: "Русская (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 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_CODEPAGE_RUSSIAN
+  id: LANG_CODEPAGE_CYRILLIC
   desc: in codepage setting menu
   user:
   <source>
-    *: "Russian (CP1251)"
+    *: "Cyrillic (CP1251)"
   </source>
   <dest>
     *: "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)
         { STR(LANG_CODEPAGE_LATIN1)          },
         { STR(LANG_CODEPAGE_GREEK)           },
         { STR(LANG_CODEPAGE_HEBREW)          },
-        { STR(LANG_CODEPAGE_RUSSIAN)         },
+        { STR(LANG_CODEPAGE_CYRILLIC)        },
         { STR(LANG_CODEPAGE_THAI)            },
         { STR(LANG_CODEPAGE_ARABIC)          },
         { 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,
             switch (cp) {
                 case 0x01: /* Greek (ISO-8859-7) */
                 case 0x02: /* Hebrew (ISO-8859-8) */
-                case 0x03: /* Russian (CP1251) */
+                case 0x03: /* Cyrillic (CP1251) */
                 case 0x04: /* Thai (ISO-8859-11) */
                 case 0x05: /* Arabic (CP1256) */
                 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)
             }
             break;
 
-        case 0x03: /* Russian (CP1251) */
+        case 0x03: /* Cyrillic (CP1251) */
             while (count--) {
                 /* first convert to unicode */
                 if (*latin1 < 0x80)