Fix loading of ru.keymap with utf8 locale set, by changing koi8-r comments to utf8. Fixes bug #1764. Patch by polyonymous.

author: paule <paule> 2007-07-08 09:08:13 (UTC)
committer: paule <paule> 2007-07-08 09:08:13 (UTC)
commit: 485270bfabbd956946a6116af012f93e011fa718 (patch) (unidiff)
tree: dc33139c101b435a440627c6d2498678d6306dc3
parent: b07e25cd398620dafb9ce01982267588645d99a9 (diff)
download: opie-485270bfabbd956946a6116af012f93e011fa718.zip
opie-485270bfabbd956946a6116af012f93e011fa718.tar.gz
opie-485270bfabbd956946a6116af012f93e011fa718.tar.bz2
1 files changed, 68 insertions, 68 deletions
diff --git a/share/multikey/ru.keymap b/share/multikey/ru.keymap
index 8cda846..b5c3b57 100644
--- a/share/multikey/ru.keymap
+++ b/share/multikey/ru.keymap
@@ -9,25 +9,25 @@ sw = RU
    ". c None"
    "a c #000000"
    "........."
    "........."
    ".aa.aa.aa"
    ".a..a..a."
    ".aa.aa.a."
    ".a...a.a."
    ".aa.aa.aa"
    "........."
    "........."
-        1 0    0x0451  2   # £
+        1 0    0x0451  2   # Ń‘
 1 0         0x31    2   # 1
        1 0         0x32    2# 2
 1 0         0x33    2   # 3
 1 0         0x34    2   # 4
 1 0         0x35    2   # 5
 1 0         0x36    2   # 6
 1 0         0x37    2   # 7
 1 0         0x38    2   # 8
 1 0         0x39    2   # 9
        1 0         0x30    2# 0
        1 0         0x2d    2# -
        1 0         0x3d    2# =
@@ -53,60 +53,60 @@ sw = RU
        "11 9 2 1"
        ". c None"
        "a c #000000"
        "..........."
        "..........."
        ".....a..a.."
        ".....aa.a.."
        ".aaaaaaaa.."
        ".....aa.a.."
        ".....a..a.."
        "..........."
        "..........."
-2 0         0x0439    2  # Ź
+2 0         0x0439    2  # Š¹
-2 0         0x0446    2  # Ć
+2 0         0x0446    2  # Ń†
-2 0         0x0443    2  # Õ
+2 0         0x0443    2  # Ń
-2 0         0x043a    2  # Ė
+2 0         0x043a    2  # Šŗ
-2 0         0x0435    2  # Å
+2 0         0x0435    2  # Šµ
-2 0         0x043d    2  # Ī
+2 0         0x043d    2  # Š½
-2 0         0x0433    2  # Ē
+2 0         0x0433    2  # Š³
-2 0         0x0448    2  # Ū
+2 0         0x0448    2  # Ń
-2 0         0x0449    2  # Ż
+2 0         0x0449    2  # Ń‰
-2 0         0x0437    2  # Ś
+2 0         0x0437    2  # Š·
-2 0         0x0445    2  # Č
+2 0         0x0445    2  # Ń…
-2 0         0x044a    2  # ß
+2 0         0x044a    2  # Ń
 2 0         0x2f      4  # /
 3 0x1024    0       4
        "17 7 2 1"
        "   c None"
        ".  c #000000"
        "                 "
        "  ..  .  ..   .. "
        " .   . . . . .   "
        " .   ... ..   .  "
        " .   . . .     . "
        "  .. . . .   ..  "
        "                 "
-3 0         0x0444    2 # Ę
+3 0         0x0444    2 # Ń„
-3 0         0x044b    2 # Ł
+3 0         0x044b    2 # Ń‹
-3 0         0x0432    2 # ×
+3 0         0x0432    2 # Š²
-3 0         0x0430    2 # Į
+3 0         0x0430    2 # Š°
-3 0         0x043f    2 # Š
+3 0         0x043f    2 # Šæ
-3 0         0x0440    2 # Ņ
+3 0         0x0440    2 # Ń€
-3 0         0x043e    2 # Ļ
+3 0         0x043e    2 # Š¾
-3 0         0x043b    2 # Ģ
+3 0         0x043b    2 # Š»
-3 0         0x0434    2 # Ä
+3 0         0x0434    2 # Š´
-3 0         0x0436    2 # Ö
+3 0         0x0436    2 # Š¶
-3 0         0x044d    2 # Ü
+3 0         0x044d    2 # Ń¨
 3 0x1004    0         5 # ENTER
        "16 9 2 1"
        ". c None"
        "a c #000000"
        "................"
        "................"
        "...........a...."
        "....aa.....a...."
        "...aa......a...."
        "..aaaaaaaaaa...."
        "...aa..........."
        "....aa.........."
@@ -114,33 +114,33 @@ sw = RU
 4 0x1020    0       5
        "21 7 2 1"
        "   c None"
        ".  c #000000"
        "                     "
        "  .. . . ... ... ... "
        " .   . .  .  .    .  "
        "  .  ...  .  ..   .  "
        "   . . .  .  .    .  "
        " ..  . . ... .    .  "
        "                     "
-4 0         0x044f    2 # Ń
+4 0         0x044f    2 # Ń¸
-4 0         0x0447    2 # Ž
+4 0         0x0447    2 # Ń‡
-4 0         0x0441    2 # Ó
+4 0         0x0441    2 # Ń
-4 0         0x043c    2 # Ķ
+4 0         0x043c    2 # Š¼
-4 0         0x0438    2 # É
+4 0         0x0438    2 # Šø
-4 0         0x0442    2 # Ō
+4 0         0x0442    2 # Ń‚
-4 0         0x044c    2 # Ų
+4 0         0x044c    2 # Ń
-4 0         0x0431    2 # Ā
+4 0         0x0431    2 # Š±
-4 0         0x044e    2 # Ą
+4 0         0x044e    2 # Ńˇ
 4 0         0x2e      2 # .
 4 0x1020    0         5 # SHIFT
        "21 7 2 1"
        "   c None"
        ".  c #000000"
        "                     "
        "  .. . . ... ... ... "
        " .   . .  .  .    .  "
        "  .  ...  .  ..   .  "
        "   . . .  .  .    .  "
        " ..  . . ... .    .  "
        "                     "
@@ -194,62 +194,62 @@ sw = RU
        "13 7 2 1"
        "   c None"
        ".  c #000000"
        "             "
        "      .      "
        "     ...     "
        "    .....    "
        "      .      "
        "      .      "
        "             "
 # shift table
-0x0451  0x0401 # £ -> ³
+0x0451  0x0401 # Ń‘ -> Š
 0x31  0x21 # 1 -> !
 0x32  0x22 # 2 -> "
 0x33  0x4e # 3 -> N
 0x34  0x3b # 4 -> ;
 0x35  0x25 # 5 -> %
 0x36  0x3a # 6 -> :
 0x37  0x3f # 7 -> ?
 0x38  0x2a # 8 -> *
 0x39  0x28 # 9 -> (
 0x30  0x29 # 0 -> )
 0x2d  0x5f # - -> _
 0x3d  0x2b # = -> +
-0x0439  0x0419  # Ź -> ź
+0x0439  0x0419  # Š¹ -> Š™
-0x0446  0x0426  # Ć -> ć
+0x0446  0x0426  # Ń† -> Š¦
-0x0443  0x0423  # Õ -> õ
+0x0443  0x0423  # Ń -> Š£
-0x043a  0x041a  # Ė -> ė
+0x043a  0x041a  # Šŗ -> Š
-0x0435  0x0415  # Å -> å
+0x0435  0x0415  # Šµ -> Š•
-0x043d  0x041d  # Ī -> ī
+0x043d  0x041d  # Š½ -> Š¯
-0x0433  0x0413  # Ē -> ē
+0x0433  0x0413  # Š³ -> Š“
-0x0448  0x0428  # Ū -> ū
+0x0448  0x0428  # Ń -> ŠØ
-0x0449  0x0429  # Ż -> ż
+0x0449  0x0429  # Ń‰ -> Š©
-0x0437  0x0417  # Ś -> ś
+0x0437  0x0417  # Š· -> Š—
-0x0445  0x0425  # Č -> č
+0x0445  0x0425  # Ń… -> Š�
-0x044a  0x042a  # ß -> ˙
+0x044a  0x042a  # Ń -> ŠŖ
-0x0444  0x0424 # Ę -> ę
+0x0444  0x0424 # Ń„ -> Š¤
-0x044b  0x042b # Ł -> ł
+0x044b  0x042b # Ń‹ -> Š«
-0x0432  0x0412 # × -> ÷
+0x0432  0x0412 # Š² -> Š’
-0x0430  0x0410 # Į -> į
+0x0430  0x0410 # Š° -> Š
-0x043f  0x041f # Š -> š
+0x043f  0x041f # Šæ -> Š
-0x0440  0x0420 # Ņ -> ņ
+0x0440  0x0420 # Ń€ -> Š 
-0x043e  0x041e # Ļ -> ļ
+0x043e  0x041e # Š¾ -> Š˛
-0x043b  0x041b # Ģ -> ģ
+0x043b  0x041b # Š» -> Š›
-0x0434  0x0414 # Ä -> ä
+0x0434  0x0414 # Š´ -> Š”
-0x0436  0x0416 # Ö -> ö
+0x0436  0x0416 # Š¶ -> Š–
-0x044d  0x042d # Ü -> ü
+0x044d  0x042d # Ń¨ -> Š
-0x044f  0x042f # Ń -> ń
+0x044f  0x042f # Ń¸ -> ŠÆ
-0x0447  0x0427 # Ž -> ž
+0x0447  0x0427 # Ń‡ -> Š§
-0x0441  0x0421 # Ó -> ó
+0x0441  0x0421 # Ń -> Š�
-0x043c  0x041c # Ķ -> ķ
+0x043c  0x041c # Š¼ -> Š
-0x0438  0x0418 # É -> é
+0x0438  0x0418 # Šø -> Š
-0x0442  0x0422 # Ō -> ō
+0x0442  0x0422 # Ń‚ -> Š¢
-0x044c  0x042c # Ų -> ų
+0x044c  0x042c # Ń -> Š¬
-0x0431  0x0411 # Ā -> ā
+0x0431  0x0411 # Š± -> Š‘
-0x044e  0x042e # Ą -> ą
+0x044e  0x042e # Ńˇ -> Š®
 0x2f    0x7c   # / -> |
 0x2e    0x2c   # . -> ,
author	paule <paule>	2007-07-08 09:08:13 (UTC)
committer	paule <paule>	2007-07-08 09:08:13 (UTC)
commit	485270bfabbd956946a6116af012f93e011fa718 (patch) (unidiff)
tree	dc33139c101b435a440627c6d2498678d6306dc3
parent	b07e25cd398620dafb9ce01982267588645d99a9 (diff)
download	opie-485270bfabbd956946a6116af012f93e011fa718.zip opie-485270bfabbd956946a6116af012f93e011fa718.tar.gz opie-485270bfabbd956946a6116af012f93e011fa718.tar.bz2

diff --git a/share/multikey/ru.keymap b/share/multikey/ru.keymap index 8cda846..b5c3b57 100644 --- a/share/multikey/ru.keymap +++ b/share/multikey/ru.keymap
@@ -9,25 +9,25 @@ sw = RU
9	". c None"	9	". c None"
10	"a c #000000"	10	"a c #000000"
11	"........."	11	"........."
12	"........."	12	"........."
13	".aa.aa.aa"	13	".aa.aa.aa"
14	".a..a..a."	14	".a..a..a."
15	".aa.aa.a."	15	".aa.aa.a."
16	".a...a.a."	16	".a...a.a."
17	".aa.aa.aa"	17	".aa.aa.aa"
18	"........."	18	"........."
19	"........."	19	"........."
20		20
21	1 0 0x0451 2 # £	21	1 0 0x0451 2 # Ń‘
22	1 0 0x31 2 # 1	22	1 0 0x31 2 # 1
23	1 0 0x32 2# 2	23	1 0 0x32 2# 2
24	1 0 0x33 2 # 3	24	1 0 0x33 2 # 3
25	1 0 0x34 2 # 4	25	1 0 0x34 2 # 4
26	1 0 0x35 2 # 5	26	1 0 0x35 2 # 5
27	1 0 0x36 2 # 6	27	1 0 0x36 2 # 6
28	1 0 0x37 2 # 7	28	1 0 0x37 2 # 7
29	1 0 0x38 2 # 8	29	1 0 0x38 2 # 8
30	1 0 0x39 2 # 9	30	1 0 0x39 2 # 9
31	1 0 0x30 2# 0	31	1 0 0x30 2# 0
32	1 0 0x2d 2# -	32	1 0 0x2d 2# -
33	1 0 0x3d 2# =	33	1 0 0x3d 2# =
@@ -53,60 +53,60 @@ sw = RU
53	"11 9 2 1"	53	"11 9 2 1"
54	". c None"	54	". c None"
55	"a c #000000"	55	"a c #000000"
56	"..........."	56	"..........."
57	"..........."	57	"..........."
58	".....a..a.."	58	".....a..a.."
59	".....aa.a.."	59	".....aa.a.."
60	".aaaaaaaa.."	60	".aaaaaaaa.."
61	".....aa.a.."	61	".....aa.a.."
62	".....a..a.."	62	".....a..a.."
63	"..........."	63	"..........."
64	"..........."	64	"..........."
65	2 0 0x0439 2 # Ź	65	2 0 0x0439 2 # Š¹
66	2 0 0x0446 2 # Ć	66	2 0 0x0446 2 # Ń†
67	2 0 0x0443 2 # Õ	67	2 0 0x0443 2 # Ń
68	2 0 0x043a 2 # Ė	68	2 0 0x043a 2 # Šŗ
69	2 0 0x0435 2 # Å	69	2 0 0x0435 2 # Šµ
70	2 0 0x043d 2 # Ī	70	2 0 0x043d 2 # Š½
71	2 0 0x0433 2 # Ē	71	2 0 0x0433 2 # Š³
72	2 0 0x0448 2 # Ū	72	2 0 0x0448 2 # Ń
73	2 0 0x0449 2 # Ż	73	2 0 0x0449 2 # Ń‰
74	2 0 0x0437 2 # Ś	74	2 0 0x0437 2 # Š·
75	2 0 0x0445 2 # Č	75	2 0 0x0445 2 # Ń…
76	2 0 0x044a 2 # ß	76	2 0 0x044a 2 # Ń
77	2 0 0x2f 4 # /	77	2 0 0x2f 4 # /
78		78
79	3 0x1024 0 4	79	3 0x1024 0 4
80	"17 7 2 1"	80	"17 7 2 1"
81	" c None"	81	" c None"
82	". c #000000"	82	". c #000000"
83	" "	83	" "
84	" .. . .. .. "	84	" .. . .. .. "
85	" . . . . . . "	85	" . . . . . . "
86	" . ... .. . "	86	" . ... .. . "
87	" . . . . . "	87	" . . . . . "
88	" .. . . . .. "	88	" .. . . . .. "
89	" "	89	" "
90	3 0 0x0444 2 # Ę	90	3 0 0x0444 2 # Ń„
91	3 0 0x044b 2 # Ł	91	3 0 0x044b 2 # Ń‹
92	3 0 0x0432 2 # ×	92	3 0 0x0432 2 # Š²
93	3 0 0x0430 2 # Į	93	3 0 0x0430 2 # Š°
94	3 0 0x043f 2 # Š	94	3 0 0x043f 2 # Šæ
95	3 0 0x0440 2 # Ņ	95	3 0 0x0440 2 # Ń€
96	3 0 0x043e 2 # Ļ	96	3 0 0x043e 2 # Š¾
97	3 0 0x043b 2 # Ģ	97	3 0 0x043b 2 # Š»
98	3 0 0x0434 2 # Ä	98	3 0 0x0434 2 # Š´
99	3 0 0x0436 2 # Ö	99	3 0 0x0436 2 # Š¶
100	3 0 0x044d 2 # Ü	100	3 0 0x044d 2 # Ń¨
101	3 0x1004 0 5 # ENTER	101	3 0x1004 0 5 # ENTER
102	"16 9 2 1"	102	"16 9 2 1"
103	". c None"	103	". c None"
104	"a c #000000"	104	"a c #000000"
105	"................"	105	"................"
106	"................"	106	"................"
107	"...........a...."	107	"...........a...."
108	"....aa.....a...."	108	"....aa.....a...."
109	"...aa......a...."	109	"...aa......a...."
110	"..aaaaaaaaaa...."	110	"..aaaaaaaaaa...."
111	"...aa..........."	111	"...aa..........."
112	"....aa.........."	112	"....aa.........."
@@ -114,33 +114,33 @@ sw = RU
114		114
115	4 0x1020 0 5	115	4 0x1020 0 5
116	"21 7 2 1"	116	"21 7 2 1"
117	" c None"	117	" c None"
118	". c #000000"	118	". c #000000"
119	" "	119	" "
120	" .. . . ... ... ... "	120	" .. . . ... ... ... "
121	" . . . . . . "	121	" . . . . . . "
122	" . ... . .. . "	122	" . ... . .. . "
123	" . . . . . . "	123	" . . . . . . "
124	" .. . . ... . . "	124	" .. . . ... . . "
125	" "	125	" "
126	4 0 0x044f 2 # Ń	126	4 0 0x044f 2 # Ń¸
127	4 0 0x0447 2 # Ž	127	4 0 0x0447 2 # Ń‡
128	4 0 0x0441 2 # Ó	128	4 0 0x0441 2 # Ń
129	4 0 0x043c 2 # Ķ	129	4 0 0x043c 2 # Š¼
130	4 0 0x0438 2 # É	130	4 0 0x0438 2 # Šø
131	4 0 0x0442 2 # Ō	131	4 0 0x0442 2 # Ń‚
132	4 0 0x044c 2 # Ų	132	4 0 0x044c 2 # Ń
133	4 0 0x0431 2 # Ā	133	4 0 0x0431 2 # Š±
134	4 0 0x044e 2 # Ą	134	4 0 0x044e 2 # Ńˇ
135	4 0 0x2e 2 # .	135	4 0 0x2e 2 # .
136	4 0x1020 0 5 # SHIFT	136	4 0x1020 0 5 # SHIFT
137	"21 7 2 1"	137	"21 7 2 1"
138	" c None"	138	" c None"
139	". c #000000"	139	". c #000000"
140	" "	140	" "
141	" .. . . ... ... ... "	141	" .. . . ... ... ... "
142	" . . . . . . "	142	" . . . . . . "
143	" . ... . .. . "	143	" . ... . .. . "
144	" . . . . . . "	144	" . . . . . . "
145	" .. . . ... . . "	145	" .. . . ... . . "
146	" "	146	" "
@@ -194,62 +194,62 @@ sw = RU
194	"13 7 2 1"	194	"13 7 2 1"
195	" c None"	195	" c None"
196	". c #000000"	196	". c #000000"
197	" "	197	" "
198	" . "	198	" . "
199	" ... "	199	" ... "
200	" ..... "	200	" ..... "
201	" . "	201	" . "
202	" . "	202	" . "
203	" "	203	" "
204		204
205	# shift table	205	# shift table
206	0x0451 0x0401 # £ -> ³	206	0x0451 0x0401 # Ń‘ -> Š
207	0x31 0x21 # 1 -> !	207	0x31 0x21 # 1 -> !
208	0x32 0x22 # 2 -> "	208	0x32 0x22 # 2 -> "
209	0x33 0x4e # 3 -> N	209	0x33 0x4e # 3 -> N
210	0x34 0x3b # 4 -> ;	210	0x34 0x3b # 4 -> ;
211	0x35 0x25 # 5 -> %	211	0x35 0x25 # 5 -> %
212	0x36 0x3a # 6 -> :	212	0x36 0x3a # 6 -> :
213	0x37 0x3f # 7 -> ?	213	0x37 0x3f # 7 -> ?
214	0x38 0x2a # 8 -> *	214	0x38 0x2a # 8 -> *
215	0x39 0x28 # 9 -> (	215	0x39 0x28 # 9 -> (
216	0x30 0x29 # 0 -> )	216	0x30 0x29 # 0 -> )
217	0x2d 0x5f # - -> _	217	0x2d 0x5f # - -> _
218	0x3d 0x2b # = -> +	218	0x3d 0x2b # = -> +
219		219
220	0x0439 0x0419 # Ź -> ź	220	0x0439 0x0419 # Š¹ -> Š™
221	0x0446 0x0426 # Ć -> ć	221	0x0446 0x0426 # Ń† -> Š¦
222	0x0443 0x0423 # Õ -> õ	222	0x0443 0x0423 # Ń -> Š£
223	0x043a 0x041a # Ė -> ė	223	0x043a 0x041a # Šŗ -> Š
224	0x0435 0x0415 # Å -> å	224	0x0435 0x0415 # Šµ -> Š•
225	0x043d 0x041d # Ī -> ī	225	0x043d 0x041d # Š½ -> Š¯
226	0x0433 0x0413 # Ē -> ē	226	0x0433 0x0413 # Š³ -> Š“
227	0x0448 0x0428 # Ū -> ū	227	0x0448 0x0428 # Ń -> ŠØ
228	0x0449 0x0429 # Ż -> ż	228	0x0449 0x0429 # Ń‰ -> Š©
229	0x0437 0x0417 # Ś -> ś	229	0x0437 0x0417 # Š· -> Š—
230	0x0445 0x0425 # Č -> č	230	0x0445 0x0425 # Ń… -> Š�
231	0x044a 0x042a # ß -> ˙	231	0x044a 0x042a # Ń -> ŠŖ
232		232
233	0x0444 0x0424 # Ę -> ę	233	0x0444 0x0424 # Ń„ -> Š¤
234	0x044b 0x042b # Ł -> ł	234	0x044b 0x042b # Ń‹ -> Š«
235	0x0432 0x0412 # × -> ÷	235	0x0432 0x0412 # Š² -> Š’
236	0x0430 0x0410 # Į -> į	236	0x0430 0x0410 # Š° -> Š
237	0x043f 0x041f # Š -> š	237	0x043f 0x041f # Šæ -> Š
238	0x0440 0x0420 # Ņ -> ņ	238	0x0440 0x0420 # Ń€ -> Š
239	0x043e 0x041e # Ļ -> ļ	239	0x043e 0x041e # Š¾ -> Š˛
240	0x043b 0x041b # Ģ -> ģ	240	0x043b 0x041b # Š» -> Š›
241	0x0434 0x0414 # Ä -> ä	241	0x0434 0x0414 # Š´ -> Š”
242	0x0436 0x0416 # Ö -> ö	242	0x0436 0x0416 # Š¶ -> Š–
243	0x044d 0x042d # Ü -> ü	243	0x044d 0x042d # Ń¨ -> Š
244		244
245	0x044f 0x042f # Ń -> ń	245	0x044f 0x042f # Ń¸ -> ŠÆ
246	0x0447 0x0427 # Ž -> ž	246	0x0447 0x0427 # Ń‡ -> Š§
247	0x0441 0x0421 # Ó -> ó	247	0x0441 0x0421 # Ń -> Š�
248	0x043c 0x041c # Ķ -> ķ	248	0x043c 0x041c # Š¼ -> Š
249	0x0438 0x0418 # É -> é	249	0x0438 0x0418 # Šø -> Š
250	0x0442 0x0422 # Ō -> ō	250	0x0442 0x0422 # Ń‚ -> Š¢
251	0x044c 0x042c # Ų -> ų	251	0x044c 0x042c # Ń -> Š¬
252	0x0431 0x0411 # Ā -> ā	252	0x0431 0x0411 # Š± -> Š‘
253	0x044e 0x042e # Ą -> ą	253	0x044e 0x042e # Ńˇ -> Š®
254	0x2f 0x7c # / -> \|	254	0x2f 0x7c # / -> \|
255	0x2e 0x2c # . -> ,	255	0x2e 0x2c # . -> ,