summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog12
-rw-r--r--rules/base.xml.in8
-rw-r--r--symbols/kz10
3 files changed, 20 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog
index 0079383d..d62d76e6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,14 @@
- 2005-09-21 svu
+2005-09-21 svu
+
+ * rules/base.xml.in, symbols/kz:
+ change Cyr to Rus
+
+2005-09-21 svu
+
+ * rules/base.ml_s.part:
+ IMPORTANT: NO MORE 2-GROUP CANADIAN DEFAULT CONFIGURATION
+
+2005-09-21 svu
* symbols/kz, symbols/Makefile.am, rules/base.xml.in:
added Kazakh, fixing
diff --git a/rules/base.xml.in b/rules/base.xml.in
index ee293d28..b2adbdff 100644
--- a/rules/base.xml.in
+++ b/rules/base.xml.in
@@ -1564,14 +1564,14 @@
<variantList>
<variant>
<configItem>
- <name>cyrkaz</name>
- <_description>Cyrillic with Kazakh</_description>
+ <name>ruskaz</name>
+ <_description>Russian with Kazakh</_description>
</configItem>
</variant>
<variant>
<configItem>
- <name>kazcyr</name>
- <_description>Kazakh with Cyrillic</_description>
+ <name>kazrus</name>
+ <_description>Kazakh with Russian</_description>
</configItem>
</variant>
</variantList>
diff --git a/symbols/kz b/symbols/kz
index 6a735d62..14df9994 100644
--- a/symbols/kz
+++ b/symbols/kz
@@ -7,7 +7,7 @@
// TODO:
// 1. AltGr with TLDE and LSGT.
-// 2. Dead key for cyrkaz and kazcyr.
+// 2. Dead key for ruskaz and kazrus.
// 3. Ctrl + <key>.
// 4. Alt-Tab.
@@ -78,9 +78,9 @@ key.type[group1]="TWO_LEVEL";
// Kikkarin KZ1
partial alphanumeric_keys
-xkb_symbols "cyrkaz" {
+xkb_symbols "ruskaz" {
- name[Group1] = "Kazakhstan - Cyrillic with Kazakh";
+ name[Group1] = "Kazakhstan - Russian with Kazakh";
key.type[group1] = "FOUR_LEVEL";
@@ -139,9 +139,9 @@ key.type[group1] = "FOUR_LEVEL_ALPHABETIC";
// Kikkarin KZ2
partial alphanumeric_keys
-xkb_symbols "kazcyr" {
+xkb_symbols "kazrus" {
- name[Group1] = "Kazakhstan - Kazakh with Cyrillic";
+ name[Group1] = "Kazakhstan - Kazakh with Russian";
key.type[group1] = "FOUR_LEVEL";