X Strike Force X.Org X11 SVN commit: r3696 - in trunk/data/xkb-data/debian: . patches
Author: barbier
Date: 2006-10-09 17:57:30 -0400 (Mon, 09 Oct 2006)
New Revision: 3696
Removed:
trunk/data/xkb-data/debian/patches/latin_quotes.diff
Modified:
trunk/data/xkb-data/debian/changelog
trunk/data/xkb-data/debian/patches/cvs.diff
trunk/data/xkb-data/debian/patches/fix_xkbcomp_crash.diff
trunk/data/xkb-data/debian/patches/series
Log:
* Sync to CVS 2006-10-09.
Also add leftsinglequotemark and rightsinglequotemark to
symbols/us(alt-intl). Closes: #391995 Thanks Jan Willem Stumpel.
Drop patches merged upstream:
+ debian/patches/latin_quotes.diff
+ debian/patches/fix_xkbcomp_crash.diff
Modified: trunk/data/xkb-data/debian/changelog
===================================================================
--- trunk/data/xkb-data/debian/changelog 2006-10-09 21:31:48 UTC (rev 3695)
+++ trunk/data/xkb-data/debian/changelog 2006-10-09 21:57:30 UTC (rev 3696)
@@ -1,9 +1,13 @@
xkeyboard-config (0.8-19) UNRELEASED; urgency=low
- * debian/patches/latin_quotes.diff: Also add leftsinglequotemark
- and rightsinglequotemark to symbols/us(alt-intl). Closes: #391995
- Thanks Jan Willem Stumpel.
+ * Sync to CVS 2006-10-09.
+ Also add leftsinglequotemark and rightsinglequotemark to
+ symbols/us(alt-intl). Closes: #391995 Thanks Jan Willem Stumpel.
+ Drop patches merged upstream:
+ + debian/patches/latin_quotes.diff
+ + debian/patches/fix_xkbcomp_crash.diff
+
-- Denis Barbier <barbier@debian.org> Mon, 9 Oct 2006 23:29:25 +0200
xkeyboard-config (0.8-18) unstable; urgency=low
Modified: trunk/data/xkb-data/debian/patches/cvs.diff
===================================================================
--- trunk/data/xkb-data/debian/patches/cvs.diff 2006-10-09 21:31:48 UTC (rev 3695)
+++ trunk/data/xkb-data/debian/patches/cvs.diff 2006-10-09 21:57:30 UTC (rev 3696)
@@ -2,7 +2,27 @@
===================================================================
--- xkb-data.orig/ChangeLog
+++ xkb-data/ChangeLog
-@@ -1,6 +1,423 @@
+@@ -1,6 +1,443 @@
++2006-10-09 Sergey Udaltsov
++
++ * NEWS, configure.in: preparing 0.9
++
++2006-10-09 Sergey Udaltsov
++
++ * tests/*: tests now run alphabetically, a bit of xslt tweaking
++ * symbols/altwin: Alt keys should be mapped on two shift levels,
++ undoing previous fix, as requested in
++ https://bugs.freedesktop.org/show_bug.cgi?id=8571
++ * symbols/level3: mapping Mod5 to keycode rather than to keysym,
++ hopefully fixing https://bugs.freedesktop.org/show_bug.cgi?id=8572
++ * symbols/us,symbols/latin: fixing quotes, closing
++ https://bugs.freedesktop.org/show_bug.cgi?id=8122
++
++2006-10-07 Sergey Udaltsov
++
++ * types/complete, types/default: putting "numpad" after "extra"
++ hopefully fixes https://bugs.freedesktop.org/show_bug.cgi?id=8402
++
+2006-10-04 Sergey Udaltsov
+
+ * symbols/fi: s/micron/dead_micron, closing
@@ -427,7 +447,7 @@
2006-02-26 Sergey Udaltsov
-@@ -35,7 +452,7 @@
+@@ -35,7 +472,7 @@
2006-02-21 svu
@@ -436,12 +456,12 @@
https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=3807
2006-02-01 svu
-@@ -742,7 +1159,7 @@
+@@ -742,7 +1179,7 @@
2004-09-13 22:39 svu
- * symbols/tj: new local cvs keyword seems to be ok - no more $Id: ChangeLog,v 1.126 2006/03/04 17:33:43 svu Exp $
-+ * symbols/tj: new local cvs keyword seems to be ok - no more $Id: ChangeLog,v 1.214 2006-10-04 20:53:40 svu Exp $
++ * symbols/tj: new local cvs keyword seems to be ok - no more $Id: ChangeLog,v 1.219 2006-10-09 21:37:13 svu Exp $
2004-09-13 22:38 svu
@@ -491,6 +511,15 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
+Index: xkb-data/NEWS
+===================================================================
+--- xkb-data.orig/NEWS
++++ xkb-data/NEWS
+@@ -1,3 +1,4 @@
++0.9 Maintenance release. Bugfixes (76). Updated/new translations. Updated/new layouts.
+ 0.8 Maintenance release. Bugfixes. Updated/new translations. Updated/new layouts.
+ Massive patch from Sun Microsystems incorporated.
+ 0.7 New layouts and keyboard models (mostly media keyboards)
Index: xkb-data/aclocal.m4
===================================================================
--- xkb-data.orig/aclocal.m4
@@ -4868,6 +4897,12 @@
===================================================================
--- xkb-data.orig/configure.in
+++ xkb-data/configure.in
+@@ -1,4 +1,4 @@
+-AC_INIT(xkeyboard-config, 0.8)
++AC_INIT(xkeyboard-config, 0.9)
+ AC_CONFIG_SRCDIR(rules/base.xml.in)
+ AM_INIT_AUTOMAKE([dist-bzip2])
+ AM_MAINTAINER_MODE
@@ -39,7 +39,7 @@
AC_PROG_INTLTOOL(0.30)
@@ -7951,7 +7986,11 @@
===================================================================
--- xkb-data.orig/po/ChangeLog
+++ xkb-data/po/ChangeLog
-@@ -1,3 +1,59 @@
+@@ -1,3 +1,63 @@
++2006-10-07 Sergey E Kvyato <kvantos@plotinka.ru>
++
++ * ru.po: updated Russian translation
++
+2006-10-03 Denis Barbier <barbier@linuxfr.org>
+
+ * fr.po: updated French translation
@@ -41652,21 +41691,32 @@
===================================================================
--- xkb-data.orig/po/ru.po
+++ xkb-data/po/ru.po
-@@ -6,7 +6,7 @@
+@@ -1,15 +1,15 @@
+ # Copyright (C) 2002 Free Software Foundation, Inc.
+ # Sergey V. Udaltsov<svu@users.sourceforge.net>
+-#
++# Sergey E Kvyato <kvantos@plotinka.ru>, 2006.
+ #
+ msgid ""
msgstr ""
"Project-Id-Version: xfree86_xkb_xml 0.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-03-04 17:41+0000\n"
+"POT-Creation-Date: 2006-09-08 22:09+0100\n"
"PO-Revision-Date: 2004-01-09 16:17+0000\n"
- "Last-Translator: Sergey V. Oudaltsov <svu@gnome.org>\n"
- "Language-Team: Russian <ru@li.org>\n"
-@@ -19,1833 +19,2013 @@
+-"Last-Translator: Sergey V. Oudaltsov <svu@gnome.org>\n"
+-"Language-Team: Russian <ru@li.org>\n"
++"Last-Translator: Sergey E. Kvyato <kvantos@plotinka.ru>\n"
++"Language-Team: <gnome-cyr@gnome.org>\n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+ "Content-Transfer-Encoding: 8bit\n"
+@@ -19,2730 +19,1994 @@
msgstr "(F)"
#: ../rules/base.xml.in.h:2
+msgid "101/104 key Compatible"
-+msgstr ""
++msgstr "Cовместимая c 101/104 кнопочной"
+
+#: ../rules/base.xml.in.h:3
msgid "101/qwerty/comma/Dead keys"
@@ -41774,11 +41824,11 @@
-#: ../rules/base.xml.in.h:22
+#: ../rules/base.xml.in.h:24
+msgid "Acer C300"
-+msgstr ""
++msgstr "Acer C300"
+
+#: ../rules/base.xml.in.h:25
+msgid "Acer Ferrari 4000"
-+msgstr ""
++msgstr "Acer Ferrari 4000"
+
+#: ../rules/base.xml.in.h:26
msgid "Acer TravelMate 800"
@@ -41802,7 +41852,8 @@
-#: ../rules/base.xml.in.h:26
+#: ../rules/base.xml.in.h:30
msgid "Add the standard behavior to Menu key."
- msgstr "Добавить стандартную функцию клавиши Menu"
+-msgstr "Добавить стандартную функцию клавиши Menu"
++msgstr "Назначить обыкновенное поведение на клавишу Menu"
-#: ../rules/base.xml.in.h:27
+#: ../rules/base.xml.in.h:31
@@ -41911,7 +41962,7 @@
-#: ../rules/base.xml.in.h:47
+#: ../rules/base.xml.in.h:52
+msgid "Apple"
-+msgstr ""
++msgstr "Apple"
+
+#: ../rules/base.xml.in.h:53
+msgid "Apple Laptop"
@@ -41949,7 +42000,8 @@
-#: ../rules/base.xml.in.h:53
+#: ../rules/base.xml.in.h:60
msgid "Azona RF2300 wireless Internet Keyboard"
- msgstr "Azona RF2300 wireless Internet Keyboard"
+-msgstr "Azona RF2300 wireless Internet Keyboard"
++msgstr "Azona RF2300 беспроводная "интернет" клавиатура"
-#: ../rules/base.xml.in.h:54
+#: ../rules/base.xml.in.h:61
@@ -41979,7 +42031,8 @@
-#: ../rules/base.xml.in.h:59
+#: ../rules/base.xml.in.h:66
msgid "BTC 9001AH"
- msgstr "BTC·9001AH"
+-msgstr "BTC·9001AH"
++msgstr "BTC 9001AH"
-#: ../rules/base.xml.in.h:60
+#: ../rules/base.xml.in.h:67
@@ -42049,22 +42102,26 @@
-#: ../rules/base.xml.in.h:73
+#: ../rules/base.xml.in.h:80
msgid "Both Alt keys together change group."
- msgstr "Две клавиши Alt вместе меняют группу."
+-msgstr "Две клавиши Alt вместе меняют группу."
++msgstr "Обе клавиши Alt, будучи нажаты вместе, меняют группу."
-#: ../rules/base.xml.in.h:74
+#: ../rules/base.xml.in.h:81
msgid "Both Ctrl keys together change group."
- msgstr "Две клавиши Ctrl вместе меняют группу."
+-msgstr "Две клавиши Ctrl вместе меняют группу."
++msgstr "Обе клавиши Ctrl, будучи нажаты вместе, меняют группу."
-#: ../rules/base.xml.in.h:75
+#: ../rules/base.xml.in.h:82
msgid "Both Shift keys together change group."
- msgstr "Две клавиши Shift вместе меняют группу."
+-msgstr "Две клавиши Shift вместе меняют группу."
++msgstr "Обе клавиши Shift, будучи нажаты вместе, меняют группу."
-#: ../rules/base.xml.in.h:76
+#: ../rules/base.xml.in.h:83
msgid "Both Win-keys switch group while pressed."
- msgstr "Две клавиши Win переключает группу на время нажатия."
+-msgstr "Две клавиши Win переключает группу на время нажатия."
++msgstr "Каждая из Win клавиш переключает группу на время нажатия."
-#: ../rules/base.xml.in.h:77
+#: ../rules/base.xml.in.h:84
@@ -42114,7 +42171,8 @@
-#: ../rules/base.xml.in.h:86
+#: ../rules/base.xml.in.h:93
msgid "CapsLock LED shows alternative group."
- msgstr "Индикатор CapsLock отображает доп. группу."
+-msgstr "Индикатор CapsLock отображает доп. группу."
++msgstr "Индикатор CapsLock отображает другую группу."
-#: ../rules/base.xml.in.h:87
-msgid "CapsLock acts as Shift with locking. Shift cancels CapsLock."
@@ -42149,7 +42207,8 @@
-#: ../rules/base.xml.in.h:92
+#: ../rules/base.xml.in.h:99
msgid "CapsLock toggles Shift so all keys are affected."
- msgstr "Включает Shift, относится ко всем клавишам."
+-msgstr "Включает Shift, относится ко всем клавишам."
++msgstr "CapsLock включает Shift, таким образом что, он действует сразу на все клавиши."
-#: ../rules/base.xml.in.h:93
+#: ../rules/base.xml.in.h:100
@@ -42169,12 +42228,13 @@
-msgstr "Включает внутреннюю капитализацию. Shift не отменяет CapsLock."
+#: ../rules/base.xml.in.h:102
+msgid "CapsLock uses internal capitalization. Shift doesn't affect CapsLock."
-+msgstr "Включает внутреннюю капитализацию. Shift не влияет CapsLock."
++msgstr "Включает внутреннюю капитализацию. Shift не влияет на CapsLock."
-#: ../rules/base.xml.in.h:96
+#: ../rules/base.xml.in.h:103
msgid "Catalan variant with middle-dot L"
- msgstr "Каталонская со средней L"
+-msgstr "Каталонская со средней L"
++msgstr "Каталонский вариант со средней L"
-#: ../rules/base.xml.in.h:97
+#: ../rules/base.xml.in.h:104
@@ -42254,7 +42314,7 @@
-#: ../rules/base.xml.in.h:111
+#: ../rules/base.xml.in.h:119
+msgid "Congo, Democratic Republic of the"
-+msgstr ""
++msgstr "Конго, Демократическая республика"
+
+#: ../rules/base.xml.in.h:120
msgid "Croatia"
@@ -42283,7 +42343,8 @@
-#: ../rules/base.xml.in.h:116
+#: ../rules/base.xml.in.h:125
msgid "Cyrillic"
- msgstr "Кириллическая"
+-msgstr "Кириллическая"
++msgstr "Кириллица"
-#: ../rules/base.xml.in.h:117
+#: ../rules/base.xml.in.h:126
@@ -42296,15 +42357,17 @@
msgstr "Чехия"
-#: ../rules/base.xml.in.h:119
+-msgid "DTK2000"
+-msgstr "DTK2000"
+#: ../rules/base.xml.in.h:128
+msgid "DRC"
-+msgstr ""
-+
-+#: ../rules/base.xml.in.h:129
- msgid "DTK2000"
- msgstr "DTK2000"
++msgstr "ДРК"
-#: ../rules/base.xml.in.h:120
++#: ../rules/base.xml.in.h:129
++msgid "DTK2000"
++msgstr "DTK2000"
++
+#: ../rules/base.xml.in.h:130
msgid "Dead acute"
msgstr "Спец. символ Dead acute"
@@ -42327,7 +42390,7 @@
-#: ../rules/base.xml.in.h:124
+#: ../rules/base.xml.in.h:134
+msgid "Dell Latitude series laptop"
-+msgstr ""
++msgstr "Лаптопы Dell серии Latitude"
+
+#: ../rules/base.xml.in.h:135
msgid "Dell USB Multimedia Keybard"
@@ -42411,7 +42474,7 @@
-#: ../rules/base.xml.in.h:140
+#: ../rules/base.xml.in.h:151
+msgid "Evdev-managed keyboard"
-+msgstr ""
++msgstr "Клавиатура управляемая посредством Evdev"
+
+#: ../rules/base.xml.in.h:152
msgid "Everex STEPnote"
@@ -42421,7 +42484,7 @@
+#: ../rules/base.xml.in.h:153
msgid "Ewe"
msgstr "Эве"
-
+-
-#: ../rules/base.xml.in.h:142
+#: ../rules/base.xml.in.h:154
msgid "Extended"
@@ -42529,7 +42592,8 @@
-#: ../rules/base.xml.in.h:162
+#: ../rules/base.xml.in.h:175
msgid "Generic 105-key (Intl) PC"
- msgstr "Обычный 105-клавишный (инт.) РС"
+-msgstr "Обычный 105-клавишный (инт.) РС"
++msgstr "Обычный 105-клавишный (Инт.) РС"
-#: ../rules/base.xml.in.h:163
+#: ../rules/base.xml.in.h:176
@@ -42637,12 +42701,14 @@
-#: ../rules/base.xml.in.h:182
+#: ../rules/base.xml.in.h:197
msgid "Hewlett-Packard Omnibook 5xx"
- msgstr "Hewlett-Packard·Omnibook·5xx"
+-msgstr "Hewlett-Packard·Omnibook·5xx"
++msgstr "Hewlett-Packard Omnibook 5xx"
-#: ../rules/base.xml.in.h:183
+#: ../rules/base.xml.in.h:198
msgid "Hewlett-Packard Omnibook 6000/6100"
- msgstr "Hewlett-Packard·Omnibook·6000/6100"
+-msgstr "Hewlett-Packard·Omnibook·6000/6100"
++msgstr "Hewlett-Packard Omnibook 6000/6100"
-#: ../rules/base.xml.in.h:184
+#: ../rules/base.xml.in.h:199
@@ -42702,7 +42768,7 @@
-#: ../rules/base.xml.in.h:195
+#: ../rules/base.xml.in.h:210
+msgid "IBM (LST 1205-92)"
-+msgstr ""
++msgstr "IBM (LST 1205-92)"
+
+#: ../rules/base.xml.in.h:211
msgid "IBM Rapid Access"
@@ -42721,7 +42787,8 @@
-#: ../rules/base.xml.in.h:198
+#: ../rules/base.xml.in.h:214
msgid "IBM ThinkPad 560Z/600/600E/A22E"
- msgstr "IBM·ThinkPad·560Z/600/600E/A22E"
+-msgstr "IBM·ThinkPad·560Z/600/600E/A22E"
++msgstr "IBM ThinkPad 560Z/600/600E/A22E"
-#: ../rules/base.xml.in.h:199
+#: ../rules/base.xml.in.h:215
@@ -42837,7 +42904,7 @@
-#: ../rules/base.xml.in.h:218
+#: ../rules/base.xml.in.h:238
+msgid "Kashubian"
-+msgstr ""
++msgstr "Кашубский"
+
+#: ../rules/base.xml.in.h:239
msgid "Kaz"
@@ -42883,7 +42950,7 @@
+
+#: ../rules/base.xml.in.h:248
+msgid "Kotoistus"
-+msgstr ""
++msgstr "Котоистус"
+
+#: ../rules/base.xml.in.h:249
+msgid "Kurdish, (F)"
@@ -42891,15 +42958,15 @@
+
+#: ../rules/base.xml.in.h:250
+msgid "Kurdish, Arabic-Latin"
-+msgstr ""
++msgstr "Курдская, Арабско-латинская"
+
+#: ../rules/base.xml.in.h:251
+msgid "Kurdish, Latin Alt-Q"
-+msgstr ""
++msgstr "Курдская, Латиница Alt-Q"
+
+#: ../rules/base.xml.in.h:252
+msgid "Kurdish, Latin Q"
-+msgstr ""
++msgstr "Курдская, Латиница Q"
+
+#: ../rules/base.xml.in.h:253
msgid "Kyr"
@@ -42928,22 +42995,26 @@
-#: ../rules/base.xml.in.h:229
+#: ../rules/base.xml.in.h:258
msgid "Laptop/notebook Compaq (eg. Armada) Laptop Keyboard"
- msgstr "Клавиатура для компьютеров Compaq (например Armada)"
+-msgstr "Клавиатура для компьютеров Compaq (например Armada)"
++msgstr "Клавиатура для лаптопов Compaq (например Armada)"
-#: ../rules/base.xml.in.h:230
+#: ../rules/base.xml.in.h:259
msgid "Laptop/notebook Compaq (eg. Presario) Internet Keyboard"
- msgstr "\"Интернет\" клавиатура для компьютеров Compaq (например Presario)"
+-msgstr "\"Интернет\" клавиатура для компьютеров Compaq (например Presario)"
++msgstr "\"Интернет\" клавиатура для лаптопов Compaq (например Presario)"
-#: ../rules/base.xml.in.h:231
+#: ../rules/base.xml.in.h:260
msgid "Laptop/notebook Dell Inspiron 6xxx/8xxx"
- msgstr "Настольная/портативная для Dell Inspiron 6xxx/8xxx"
+-msgstr "Настольная/портативная для Dell Inspiron 6xxx/8xxx"
++msgstr "Лаптопы Dell Inspiron 6xxx/8xxx"
-#: ../rules/base.xml.in.h:232
+#: ../rules/base.xml.in.h:261
msgid "Laptop/notebook eMachines m68xx"
- msgstr "Настольная/портативная для eMachines m68xx"
+-msgstr "Настольная/портативная для eMachines m68xx"
++msgstr "Лаптопы eMachines m68xx"
-#: ../rules/base.xml.in.h:233
+#: ../rules/base.xml.in.h:262
@@ -43223,7 +43294,8 @@
-#: ../rules/base.xml.in.h:281
+#: ../rules/base.xml.in.h:317
msgid "Meta is mapped to the Win-keys."
- msgstr "Мета соответствует клавишам Win"
+-msgstr "Мета соответствует клавишам Win"
++msgstr "Meta соответствует клавишам Win"
-#: ../rules/base.xml.in.h:282
+#: ../rules/base.xml.in.h:318
@@ -43253,7 +43325,8 @@
-#: ../rules/base.xml.in.h:287
+#: ../rules/base.xml.in.h:323
msgid "Microsoft Natural Keyboard Pro OEM"
- msgstr "Microsoft·Natural·Keyboard·Pro·OEM"
+-msgstr "Microsoft·Natural·Keyboard·Pro·OEM"
++msgstr "Microsoft Natural Keyboard Pro OEM"
-#: ../rules/base.xml.in.h:288
+#: ../rules/base.xml.in.h:324
@@ -43327,11 +43400,11 @@
+
+#: ../rules/base.xml.in.h:338
+msgid "Nep"
-+msgstr ""
++msgstr "Неп"
+
+#: ../rules/base.xml.in.h:339
+msgid "Nepal"
-+msgstr ""
++msgstr "Непал"
+
+#: ../rules/base.xml.in.h:340
msgid "Netherlands"
@@ -43355,7 +43428,8 @@
-#: ../rules/base.xml.in.h:305
+#: ../rules/base.xml.in.h:344
msgid "Northern Saami, eliminate dead keys"
- msgstr "Северная Саамская, исключить специальные клавиши (dead keys)"
+-msgstr "Северная Саамская, исключить специальные клавиши (dead keys)"
++msgstr "Северная Саамская, исключая специальные клавиши (dead keys)"
-#: ../rules/base.xml.in.h:306
+#: ../rules/base.xml.in.h:345
@@ -43707,7 +43781,8 @@
+#: ../rules/base.xml.in.h:413
msgid "Shift with numpad keys works as in MS Windows."
msgstr ""
- "Клавиша Shift с клавишами цифровой клавиатуры работают как в MS Windows."
+-"Клавиша Shift с клавишами цифровой клавиатуры работают как в MS Windows."
++"Клавиша Shift с клавишами цифровой клавиатуры работают также как в MS Windows."
-#: ../rules/base.xml.in.h:373
+#: ../rules/base.xml.in.h:414
@@ -43742,7 +43817,8 @@
-#: ../rules/base.xml.in.h:379
+#: ../rules/base.xml.in.h:420
msgid "Special keys (Ctrl+Alt+<key>) handled in a server."
- msgstr "Специальные клавиши (Ctrl+Alt+<клв>)·обрабатываются сервером."
+-msgstr "Специальные клавиши (Ctrl+Alt+<клв>)·обрабатываются сервером."
++msgstr "Специальные клавиши (Ctrl+Alt+<клв>) обрабатываются сервером."
-#: ../rules/base.xml.in.h:380
+#: ../rules/base.xml.in.h:421
@@ -44060,7 +44136,7 @@
-#: ../rules/base.xml.in.h:444
+#: ../rules/base.xml.in.h:484
+msgid "Wang model 724 azerty"
-+msgstr ""
++msgstr "Wang model 724 azerty"
+
+#: ../rules/base.xml.in.h:485
msgid "Winbook Model XP5"
@@ -44087,7 +44163,7 @@
+#: ../rules/base.xml.in.h:489
msgid "Yahoo! Internet Keyboard"
msgstr "Yahoo! Internet Keyboard"
-
+-
-#: ../rules/base.xml.in.h:449
+#: ../rules/base.xml.in.h:490
msgid "Z and ZHE swapped"
@@ -44141,63 +44217,906 @@
-#: ../rules/base.xml.in.h:459
-msgid "si1452"
-msgstr "si1452"
-+#~ msgid "Logitech Deluxe Access Keyboard"
-+#~ msgstr "Logitech Deluxe Access Keyboard"
-+
-+#~ msgid "Logitech iTouch keyboard Internet Navigator"
-+#~ msgstr "Logitech iTouch keyboard Internet Navigator"
-+
-+#~ msgid "Power G5"
-+#~ msgstr "Power G5"
-+
-+#~ msgid "US keyboard with Maltian letters"
-+#~ msgstr "Клавиатура США с мальтийскими буквами"
-+
-+#~ msgid "si1452"
-+#~ msgstr "si1452"
-
- #~ msgid "Turkish"
- #~ msgstr "Турецкая"
-@@ -1856,9 +2036,6 @@
- #~ msgid "\"Standard\""
- #~ msgstr "\"Стандартная\""
-
+-
+-#~ msgid "Turkish"
+-#~ msgstr "Турецкая"
+-
+-#~ msgid "Khmer"
+-#~ msgstr "Кхмер"
+-
+-#~ msgid "\"Standard\""
+-#~ msgstr "\"Стандартная\""
+-
-#~ msgid "Romanian keyboard with MS layout"
-#~ msgstr "Румынская клавиатура с раскладкой MS"
-
- #~ msgid "Romanian standard keyboard"
- #~ msgstr "Румынская стандартная клавиатура"
-
-@@ -1883,9 +2060,6 @@
- #~ msgid "CloGaelach Laptop"
- #~ msgstr "CloGaelach для лаптопов"
-
+-#~ msgid "Romanian standard keyboard"
+-#~ msgstr "Румынская стандартная клавиатура"
+-
+-#~ msgid "Serbia"
+-#~ msgstr "Сербия"
+-
+-#~ msgid "Srp"
+-#~ msgstr "Срб"
+-
+-#~ msgid "Tamil INSCRIPT"
+-#~ msgstr "Тамильская INSCRIPT"
+-
+-#~ msgid "US keyboard with Romanian letters"
+-#~ msgstr "Клавиатура США с румынскими буквами"
+-
+-#~ msgid "Dhivehi"
+-#~ msgstr "Дивехи"
+-
+-#~ msgid "Div"
+-#~ msgstr "Див"
+-
+-#~ msgid "CloGaelach Laptop"
+-#~ msgstr "CloGaelach для лаптопов"
+-
-#~ msgid "Laptop"
-#~ msgstr "Лаптоп"
-
- #~ msgid "Ogham IS434 laptop"
- #~ msgstr "Огхам лаптоп IS434"
-
-@@ -1997,9 +2171,6 @@
- #~ msgid "abnt2"
- #~ msgstr "abnt2"
-
+-#~ msgid "Ogham IS434 laptop"
+-#~ msgstr "Огхам лаптоп IS434"
+-
+-#~ msgid "Ogham laptop"
+-#~ msgstr "Огхам лаптоп"
+-
+-#~ msgid "Sinhala phonetic"
+-#~ msgstr "Синхала фонетическая"
+-
+-#~ msgid "Malayalam with Malayalam digits"
+-#~ msgstr "Малайалам с цифрами малайалам"
+-
+-#~ msgid "Bengali INSCRIPT"
+-#~ msgstr "Бенгальская INSCRIPT"
+-
+-#~ msgid "Devanagari INSCRIPT"
+-#~ msgstr "Девангари INSCRIPT"
+-
+-#~ msgid "Dzo"
+-#~ msgstr "Дзо"
+-
+-#~ msgid "Dzongkha"
+-#~ msgstr "Дзонгкха"
+-
+-#~ msgid "Finish and Swedish"
+-#~ msgstr "Финская и Шведская"
+-
+-#~ msgid "Gurmukhi INSCRIPT"
+-#~ msgstr "Гурмукхи INSCRIPT"
+-
+-#~ msgid "Kannada INSCRIPT"
+-#~ msgstr "Каннада INSCRIPT"
+-
+-#~ msgid "Oriya INSCRIPT"
+-#~ msgstr "Орийя INSCRIPT"
+-
+-#~ msgid "Smi"
+-#~ msgstr "Cми"
+-
+-#~ msgid "Telugu INSCRIPT"
+-#~ msgstr "Telugu INSCRIPT"
+-
+-#~ msgid "Ben"
+-#~ msgstr "Бен"
+-
+-#~ msgid "Deva"
+-#~ msgstr "Девн"
+-
+-#~ msgid "Guj"
+-#~ msgstr "Гудж"
+-
+-#~ msgid "INSCRIPT layout"
+-#~ msgstr "Раскладка INSCRIPT"
+-
+-#~ msgid "Iku"
+-#~ msgstr "Инн"
+-
+-#~ msgid "Ogam"
+-#~ msgstr "Огам"
+-
+-#~ msgid "Ori"
+-#~ msgstr "Ори"
+-
+-#~ msgid "Sin"
+-#~ msgstr "Сен"
+-
+-#~ msgid "Sinhala"
+-#~ msgstr "Сенегальская"
+-
+-#~ msgid "Tam"
+-#~ msgstr "Там"
+-
+-#~ msgid "Tel"
+-#~ msgstr "Тел"
+-
+-#~ msgid "Typewrite-style keymap; TAB encoding"
+-#~ msgstr "\"Печатная машинка\", кодировка TAB"
+-
+-#~ msgid "Typewrite-style keymap; TSCII encoding"
+-#~ msgstr "\"Печатная·машинка\",·кодировка·TSCII"
+-
+-#~ msgid "Urd"
+-#~ msgstr "Урд"
+-
+-#~ msgid "Typewrite-style keymap; Unicode encoding"
+-#~ msgstr "\"Печатная·машинка\",·кодировка·Unicode"
+-
+-#~ msgid "Basic (RALT) variant"
+-#~ msgstr "Базовый вариант (RALT)"
+-
+-#~ msgid "German"
+-#~ msgstr "Немецкая"
+-
+-#~ msgid "Kedmanee"
+-#~ msgstr "Кедмани"
+-
+-#~ msgid "Latin QWERTY"
+-#~ msgstr "Латинская QWERTY"
+-
+-#~ msgid "Latin Unicode QWERTY"
+-#~ msgstr "Латинская Unicode QWERTY"
+-
+-#~ msgid "Norwegian"
+-#~ msgstr "Норвежская"
+-
+-#~ msgid "Old standard"
+-#~ msgstr "Старая стандартная"
+-
+-#~ msgid "abnt2"
+-#~ msgstr "abnt2"
+-
-#~ msgid "Czech Republic"
-#~ msgstr "Чешская Республика"
-
- #~ msgid "Bosnian"
- #~ msgstr "Боснийская"
-
-@@ -2087,9 +2258,6 @@
- #~ msgid "US"
- #~ msgstr "США"
-
+-#~ msgid "Bosnian"
+-#~ msgstr "Боснийская"
+-
+-#~ msgid "Danish"
+-#~ msgstr "Датская"
+-
+-#~ msgid "Dutch"
+-#~ msgstr "Голландская"
+-
+-#~ msgid "Finnish"
+-#~ msgstr "Финская"
+-
+-#~ msgid "Irish"
+-#~ msgstr "Ирландская"
+-
+-#~ msgid "Italian"
+-#~ msgstr "Итальянская"
+-
+-#~ msgid "Polish"
+-#~ msgstr "Польская"
+-
+-#~ msgid "Spanish"
+-#~ msgstr "Испанская"
+-
+-#~ msgid "Swedish"
+-#~ msgstr "Шведская"
+-
+-#~ msgid "Swiss"
+-#~ msgstr "Швейцарская"
+-
+-#~ msgid "PC104"
+-#~ msgstr "PC104"
+-
+-#~ msgid "CapsLock toggles group."
+-#~ msgstr "Клавиша CapsLock меняет группу."
+-
+-#~ msgid "Toggles the group."
+-#~ msgstr "Переключает группу."
+-
+-#~ msgid "Toggles the group key between two keyboard groups."
+-#~ msgstr "Включает клавишу переключения между двумя клавиатурными группами."
+-
+-#~ msgid "Cyrillic (swap Zhe, Ze)"
+-#~ msgstr "Кириллическая (переставлены Ж, З)"
+-
+-#~ msgid "Polish with Polish quotes on key \"1/!\""
+-#~ msgstr "Польская с польскими кавычками на клавише \"1/!\""
+-
+-#~ msgid "Serbian Latin (swap Y, Z)"
+-#~ msgstr "Сербская латинская (переставлены Y, Z)"
+-
+-#~ msgid "Serbian Latin Unicode (swap ZHE, Z)"
+-#~ msgstr "Сербская Латинская Unicode (переставлены Ж, З)"
+-
+-#~ msgid "Yug"
+-#~ msgstr "Юг"
+-
+-#~ msgid "Yugoslavian"
+-#~ msgstr "Югославская"
+-
+-#~ msgid "Arb"
+-#~ msgstr "Араб"
+-
+-#~ msgid "Burmese"
+-#~ msgstr "Бирманская"
+-
+-#~ msgid "Grc"
+-#~ msgstr "Греч"
+-
+-#~ msgid "Hindi"
+-#~ msgstr "Хинди"
+-
+-#~ msgid "Ogh"
+-#~ msgstr "Огх"
+-
+-#~ msgid "Scg"
+-#~ msgstr "Срб"
+-
+-#~ msgid "Sme"
+-#~ msgstr "Саам"
+-
+-#~ msgid "Tml"
+-#~ msgstr "Тамил"
+-
+-#~ msgid "US"
+-#~ msgstr "США"
+-
-#~ msgid "Turkish (F)"
-#~ msgstr "Турецкая (F)"
-
- #~ msgid "Korean"
- #~ msgstr "Корейская"
-
+-#~ msgid "Korean"
+-#~ msgstr "Корейская"
+-
+-#~ msgid "Lithuanian azerty standard"
+-#~ msgstr "Литовская стандартная azerty"
+-
+-#~ msgid "uni/101/qwerty/comma"
+-#~ msgstr "Unicode pc101, qwerty, запятая"
+-
+-#~ msgid "uni/101/qwerty/dot"
+-#~ msgstr "Unicode pc101, qwerty, точка"
+-
+-#~ msgid "uni/101/qwertz/comma"
+-#~ msgstr "Unicode pc101, qwertz, запятая"
+-
+-#~ msgid "uni/101/qwertz/dot"
+-#~ msgstr "Unicode pc101, qwertz, точка"
+-
+-#~ msgid "uni/102/qwerty/comma"
+-#~ msgstr "Unicode pc102, qwerty, запятая"
+-
+-#~ msgid "uni/102/qwerty/dot"
+-#~ msgstr "Unicode pc102, qwerty, запятая"
+-
+-#~ msgid "uni/102/qwertz/comma"
+-#~ msgstr "Unicode pc102, qwertz, запятая"
+-
+-#~ msgid "uni/102/qwertz/dot"
+-#~ msgstr "Unicode pc102, qwertz, точка"
+-
+-#~ msgid "Alternate"
+-#~ msgstr "Добавочная"
+-
+-#~ msgid "French Canadian"
+-#~ msgstr "Французская Канадская"
+-
+-#~ msgid "US layout"
+-#~ msgstr "Раскладка INSCRIPT"
+-
+-#~ msgid "Basic"
+-#~ msgstr "Базовая"
+-
+-#~ msgid "Czech (qwerty)"
+-#~ msgstr "Чешская (qwerty)"
+-
+-#~ msgid "Georgian (latin)"
+-#~ msgstr "Грузинская \"латинская\""
+-
+-#~ msgid "Georgian (russian)"
+-#~ msgstr "Грузинская \"русская\""
+-
+-#~ msgid "Israeli phonetic"
+-#~ msgstr "Иврит фонетическая"
+-
+-#~ msgid "Maltese (US layout)"
+-#~ msgstr "Мальтийская (Американская раскладка)"
+-
+-#~ msgid "Northern Saami (Finland)"
+-#~ msgstr "Саамская (Финляндия)"
+-
+-#~ msgid "Northern Saami (Sweden)"
+-#~ msgstr "Саамская (Швеция)"
+-
+-#~ msgid "Polish (qwertz)"
+-#~ msgstr "Польская (qwertz)"
+-
+-#~ msgid "Slovak (qwerty)"
+-#~ msgstr "Словацкая (qwerty)"
+-
+-#~ msgid "Swiss French"
+-#~ msgstr "Французская (Швейцария)"
+-
+-#~ msgid "U.S. English w/ ISO9995-3"
+-#~ msgstr "Английская (США) с ISO9995-3"
+-
+-#~ msgid "U.S. English w/ dead keys"
+-#~ msgstr "Английская (США) со специальными клавишами (dead keys)"
+-
+-#~ msgid "bksl"
+-#~ msgstr "bksl"
+-
+-#~ msgid "sefi"
+-#~ msgstr "sefi"
+-
+-#~ msgid "Sv"
+-#~ msgstr "Sv"
+-
+-#~ msgid "ar(azerty) - No decription"
+-#~ msgstr "azerty"
+-
+-#~ msgid "ar(azerty_digits) - No decription"
+-#~ msgstr "azerty, цифры"
+-
+-#~ msgid "ar(digits) - No decription"
+-#~ msgstr "с цифрами"
+-
+-#~ msgid "ar(qwerty) - No decription"
+-#~ msgstr "qwerty"
+-
+-#~ msgid "ar(qwerty_digits) - No decription"
+-#~ msgstr "qwerty, цифры"
+-
+-#~ msgid "az(cyrillic) - No decription"
+-#~ msgstr "кириллица"
+-
+-#~ msgid "az(latin) - No decription"
+-#~ msgstr "латиница"
+-
+-#~ msgid "be(Sundeadkeys) - No decription"
+-#~ msgstr "Sundeadkeys"
+-
+-#~ msgid "be(iso-alternate) - No decription"
+-#~ msgstr "альтернативная iso"
+-
+-#~ msgid "be(sundeadkeys) - No decription"
+-#~ msgstr "sundeadkeys"
+-
+-#~ msgid "bg(phonetic) - No decription"
+-#~ msgstr "фонетическая"
+-
+-#~ msgid "br(abnt2) - No decription"
+-#~ msgstr "ABNT2"
+-
+-#~ msgid "by(winkeys) - No decription"
+-#~ msgstr "Microsoft"
+-
+-#~ msgid "ca(alternate) - No decription"
+-#~ msgstr "альтернативная"
+-
+-#~ msgid "ca(sundeadkeys) - No decription"
+-#~ msgstr "sundeadkeys"
+-
+-#~ msgid "ca_enhanced(Sundeadkeys) - No decription"
+-#~ msgstr "Sundeadkeys"
+-
+-#~ msgid "ca_enhanced(basic) - No decription"
+-#~ msgstr "простая"
+-
+-#~ msgid "ca_enhanced(sundeadkeys) - No decription"
+-#~ msgstr "sundeadkeys"
+-
+-#~ msgid "cz(basic) - No decription"
+-#~ msgstr "простая"
+-
+-#~ msgid "cz(bksl) - No decription"
+-#~ msgstr "bksl"
+-
+-#~ msgid "cz_qwerty(basic) - No decription"
+-#~ msgstr "простая qwerty"
+-
+-#~ msgid "cz_qwerty(bksl) - No decription"
+-#~ msgstr "bksl qwerty"
+-
+-#~ msgid "de(basic) - No decription"
+-#~ msgstr "простая"
+-
+-#~ msgid "de(deadacute) - No decription"
+-#~ msgstr "deadacute"
+-
+-#~ msgid "de(deadgraveacute) - No decription"
+-#~ msgstr "deadgraveacute"
+-
+-#~ msgid "de_CH(Sundeadkeys) - No decription"
+-#~ msgstr "Sundeadkeys"
+-
+-#~ msgid "de_CH(sundeadkeys) - No decription"
+-#~ msgstr "sundeadkeys"
+-
+-#~ msgid "dvorak(no) - No decription"
+-#~ msgstr "Норвегия"
+-
+-#~ msgid "dvorak(se) - No decription"
+-#~ msgstr "Швеция SE"
+-
+-#~ msgid "dvorak(sv) - No decription"
+-#~ msgstr "Швеция SV"
+-
+-#~ msgid "el(extended) - No decription"
+-#~ msgstr "Расширенная"
+-
+-#~ msgid "el(polytonic) - No decription"
+-#~ msgstr "Политоническая"
+-
+-#~ msgid "es(Sundeadkeys) - No decription"
+-#~ msgstr "Sundeadkeys"
+-
+-#~ msgid "es(sundeadkeys) - No decription"
+-#~ msgstr "sundeadkeys"
+-
+-#~ msgid "fi(basic) - No decription"
+-#~ msgstr "простая"
+-
+-#~ msgid "fr(Sundeadkeys) - No decription"
+-#~ msgstr "Sundeadkeys"
+-
+-#~ msgid "fr(sundeadkeys) - No decription"
+-#~ msgstr "sundeadkeys"
+-
+-#~ msgid "fr-latin9(Sundeadkeys) - No decription"
+-#~ msgstr "Latin9, Sundeadkeys"
+-
+-#~ msgid "fr-latin9(sundeadkeys) - No decription"
+-#~ msgstr "Latin9, sundeadkeys"
+-
+-#~ msgid "fr_CH(Sundeadkeys) - No decription"
+-#~ msgstr "Sundeadkeys"
+-
+-#~ msgid "fr_CH(sundeadkeys) - No decription"
+-#~ msgstr "sundeadkeys"
+-
+-#~ msgid "hu(Sundeadkeys) - No decription"
+-#~ msgstr "Sundeadkeys"
+-
+-#~ msgid "hu(l2_101_qwerty_comma) - No decription"
+-#~ msgstr "Latin2 pc101, qwerty, запятая"
+-
+-#~ msgid "hu(l2_101_qwerty_dot) - No decription"
+-#~ msgstr "Latin2 pc101, qwerty, точка"
+-
+-#~ msgid "hu(l2_101_qwertz_comma) - No decription"
+-#~ msgstr "Latin2 pc101, qwertz, запятая"
+-
+-#~ msgid "hu(l2_101_qwertz_dot) - No decription"
+-#~ msgstr "Latin2 pc101, qwertz, точка"
+-
+-#~ msgid "hu(l2_102_qwerty_dot) - No decription"
+-#~ msgstr "Latin2 pc102, qwerty, точка"
+-
+-#~ msgid "hu(l2_102_qwertz_comma) - No decription"
+-#~ msgstr "Latin2 pc102, qwertz, запятая"
+-
+-#~ msgid "hu(l2_102_qwertz_dot) - No decription"
+-#~ msgstr "Latin2 pc102, qwertz, точка"
+-
+-#~ msgid "hu(standard) - No decription"
+-#~ msgstr "стандартная"
+-
+-#~ msgid "hu(sundeadkeys) - No decription"
+-#~ msgstr "sundeadkeys"
+-
+-#~ msgid "hu(uni_101_qwerty_comma) - No decription"
+-#~ msgstr "Unicode pc101, qwerty, запятая"
+-
+-#~ msgid "hu(uni_101_qwerty_dot) - No decription"
+-#~ msgstr "Unicode pc101, qwerty, точка"
+-
+-#~ msgid "hu(uni_101_qwertz_comma) - No decription"
+-#~ msgstr "Unicode pc101, qwertz, запятая"
+-
+-#~ msgid "hu(uni_101_qwertz_dot) - No decription"
+-#~ msgstr "Unicode pc101, qwertz, точка"
+-
+-#~ msgid "hu(uni_102_qwerty_comma) - No decription"
+-#~ msgstr "Unicode pc102, qwerty, запятая"
+-
+-#~ msgid "hu(uni_102_qwerty_dot) - No decription"
+-#~ msgstr "Unicode pc102, qwerty, точка"
+-
+-#~ msgid "hu(uni_102_qwertz_comma) - No decription"
+-#~ msgstr "Unicode pc102, qwertz, запятая"
+-
+-#~ msgid "hu(uni_102_qwertz_dot) - No decription"
+-#~ msgstr "Unicode pc102, qwertz, точка"
+-
+-#~ msgid "ie - No decription"
+-#~ msgstr "Ирландская"
+-
+-#~ msgid "ie(CloGaelach) - No decription"
+-#~ msgstr "CloGaelach"
+-
+-#~ msgid "ie(UnicodeExpert) - No decription"
+-#~ msgstr "уникод"
+-
+-#~ msgid "ie(laptop) - No decription"
+-#~ msgstr "для настольных ПК"
+-
+-#~ msgid "il(lyx) - No decription"
+-#~ msgstr "lyx"
+-
+-#~ msgid "il(si1452) - No decription"
+-#~ msgstr "sil1452"
+-
+-#~ msgid "il_phonetic - No decription"
+-#~ msgstr "Иврит, фонетическая"
+-
+-#~ msgid "is(Sundeadkeys) - No decription"
+-#~ msgstr "Sundeadkeys"
+-
+-#~ msgid "la(Sundeadkeys) - No decription"
+-#~ msgstr "Sundeadkeys"
+-
+-#~ msgid "la(sundeadkeys) - No decription"
+-#~ msgstr "sundeadkeys"
+-
+-#~ msgid "lt(lt_std) - No decription"
+-#~ msgstr "стандартная"
+-
+-#~ msgid "lt(lt_us) - No decription"
+-#~ msgstr "американская"
+-
+-#~ msgid "lt_std(Sundeadkeys) - No decription"
+-#~ msgstr "Sundeadkeys"
+-
+-#~ msgid "lt_std(sundeadkeys) - No decription"
+-#~ msgstr "sundeadkeys"
+-
+-#~ msgid "macintosh - No decription"
+-#~ msgstr "Macintosh"
+-
+-#~ msgid "macintosh_old - No decription"
+-#~ msgstr "Старая Macintosh"
+-
+-#~ msgid "mk(pc104) - No decription"
+-#~ msgstr "pc104"
+-
+-#~ msgid "no(basic) - No decription"
+-#~ msgstr "простая"
+-
+-#~ msgid "ogham(IS434) - No decription"
+-#~ msgstr "IS434"
+-
+-#~ msgid "ogham(IS434laptop) - No decription"
+-#~ msgstr "IS434 для настольных ПК"
+-
+-#~ msgid "ogham(is434) - No decription"
+-#~ msgstr "is434"
+-
+-#~ msgid "ogham(is434laptop) - No decription"
+-#~ msgstr "is434 для настольных ПК"
+-
+-#~ msgid "ogham(laptop) - No decription"
+-#~ msgstr "для настольных ПК"
+-
+-#~ msgid "powerpcps2 - No decription"
+-#~ msgstr "PowerPC PS/2"
+-
+-#~ msgid "pt(Sundeadkeys) - No decription"
+-#~ msgstr "Sundeadkeys"
+-
+-#~ msgid "pt(sundeadkeys) - No decription"
+-#~ msgstr "sundeadkeys"
+-
+-#~ msgid "ru(phonetic) - No decription"
+-#~ msgstr "фонетическая"
+-
+-#~ msgid "ru(typewriter) - No decription"
+-#~ msgstr "\"Печатная машинка\""
+-
+-#~ msgid "ru(winkeys) - No decription"
+-#~ msgstr "Microsoft"
+-
+-#~ msgid "sapmi - No decription"
+-#~ msgstr "Саамская"
+-
+-#~ msgid "sapmi(basic) - No decription"
+-#~ msgstr "простая"
+-
+-#~ msgid "sapmi(sefi) - No decription"
+-#~ msgstr "шведско-финская"
+-
+-#~ msgid "se(basic) - No decription"
+-#~ msgstr "простая"
+-
+-#~ msgid "sk(basic) - No decription"
+-#~ msgstr "простая"
+-
+-#~ msgid "sk(bksl) - No decription"
+-#~ msgstr "bksl"
+-
+-#~ msgid "sk_qwerty(basic) - No decription"
+-#~ msgstr "простая-qwerty"
+-
+-#~ msgid "sk_qwerty(bksl) - No decription"
+-#~ msgstr "bksl-qwerty"
+-
+-#~ msgid "ua(phonetic) - No decription"
+-#~ msgstr "фонетическая"
+-
+-#~ msgid "ua(typewriter) - No decription"
+-#~ msgstr "\"Печатная машинка\""
+-
+-#~ msgid "ua(winkeys) - No decription"
+-#~ msgstr "Microsoft"
+-
+-#~ msgid "Us"
+-#~ msgstr "Ам"
+-
+-#~ msgid "en_US"
+-#~ msgstr "ам"
+-
+-#~ msgid "us"
+-#~ msgstr "ам"
+-
+-#~ msgid "Compaq Internet"
+-#~ msgstr "Compaq Internet"
+-
+-#~ msgid "HP Internet"
+-#~ msgstr "HP Internet"
+-
+-#~ msgid "bg(bds_enhanced) - No decription"
+-#~ msgstr "расширенная БДС"
+-
+-#~ msgid "bg(phonetic_enhanced) - No decription"
+-#~ msgstr "расширенная фонетическая"
+-
+-#~ msgid "br(Sundeadkeys) - No decription"
+-#~ msgstr "Sundeadkeys"
+-
+-#~ msgid "br(sundeadkeys) - No decription"
+-#~ msgstr "sundeadkeys"
+-
+-#~ msgid "btc9000 - No decription"
+-#~ msgstr "btc9000"
+-
+-#~ msgid "ca(Sundeadkeys) - No decription"
+-#~ msgstr "Sundeadkeys"
+-
+-#~ msgid "ca_enhanced - No decription"
+-#~ msgstr "Канадская расширенная "
+-
+-#~ msgid "dk(Sundeadkeys) - No decription"
+-#~ msgstr "Sundeadkeys"
+-
+-#~ msgid "dk(sundeadkeys) - No decription"
+-#~ msgstr "sundeadkeys"
+-
+-#~ msgid "ee(Sundeadkeys) - No decription"
+-#~ msgstr "Sundeadkeys"
+-
+-#~ msgid "ee(sundeadkeys) - No decription"
+-#~ msgstr "sundeadkeys"
+-
+-#~ msgid "el(sundeadkeys) - No decription"
+-#~ msgstr "sundeadkeys"
+-
+-#~ msgid "en_US(pc101_nodeadkeys) - No decription"
+-#~ msgstr "pc101, nodeadkeys"
+-
+-#~ msgid "en_US(pc102) - No decription"
+-#~ msgstr "pc102"
+-
+-#~ msgid "en_US(pc102_nodeadkeys) - No decription"
+-#~ msgstr "pc102, nodeadkeys"
+-
+-#~ msgid "en_US(pc104) - No decription"
+-#~ msgstr "pc104"
+-
+-#~ msgid "en_US(pc104_nodeadkeys) - No decription"
+-#~ msgstr "pc104, nodeadkeys"
+-
+-#~ msgid "en_US(pc105) - No decription"
+-#~ msgstr "pc105"
+-
+-#~ msgid "en_US(pc105_nodeadkeys) - No decription"
+-#~ msgstr "pc105, nodeadkeys"
+-
+-#~ msgid "en_US(pc_universal) - No decription"
+-#~ msgstr "универсальная"
+-
+-#~ msgid "en_US(pc_universal_nodeadkeys) - No decription"
+-#~ msgstr "универсальная, nodeadkeys"
+-
+-#~ msgid "en_US(sun4) - No decription"
+-#~ msgstr "sun4"
+-
+-#~ msgid "en_US(sun4_nodeadkeys) - No decription"
+-#~ msgstr "sun5, nodeadkeys"
+-
+-#~ msgid "en_US(sun5) - No decription"
+-#~ msgstr "sun5"
+-
+-#~ msgid "en_US(sun5_nodeadkeys) - No decription"
+-#~ msgstr "sun5, nodeadkeys"
+-
+-#~ msgid "gb(Sundeadkeys) - No decription"
+-#~ msgstr "Sundeadkeys"
+-
+-#~ msgid "gb(ibm168) - No decription"
+-#~ msgstr "IBM168"
+-
+-#~ msgid "gb(sundeadkeys) - No decription"
+-#~ msgstr "sundeadkeys"
+-
+-#~ msgid "hu_US - No decription"
+-#~ msgstr "Венгерская для США"
+-
+-#~ msgid "hu_US(Sundeadkeys) - No decription"
+-#~ msgstr "Sundeadkeys"
+-
+-#~ msgid "hu_US(sundeadkeys) - No decription"
+-#~ msgstr "sundeadkeys"
+-
+-#~ msgid "ir(digits) - No decription"
+-#~ msgstr "с цифрами"
+-
+-#~ msgid "is(sundeadkeys) - No decription"
+-#~ msgstr "sundeadkeys"
+-
+-#~ msgid "it(Sundeadkeys) - No decription"
+-#~ msgstr "Sundeadkeys"
+-
+-#~ msgid "it(sundeadkeys) - No decription"
+-#~ msgstr "sundeadkeys"
+-
+-#~ msgid "lt(Sundeadkeys) - No decription"
+-#~ msgstr "Sundeadkeys"
+-
+-#~ msgid "lt(sundeadkeys) - No decription"
+-#~ msgstr "sundeadkeys"
+-
+-#~ msgid "lt(us_group2) - No decription"
+-#~ msgstr "группа2 - американская"
+-
+-#~ msgid "lv(Sundeadkeys) - No decription"
+-#~ msgstr "Sundeadkeys"
+-
+-#~ msgid "lv(sundeadkeys) - No decription"
+-#~ msgstr "sundeadkeys"
+-
+-#~ msgid "mk(group1) - No decription"
+-#~ msgstr "группа 1"
+-
+-#~ msgid "no(Sundeadkeys) - No decription"
+-#~ msgstr "Sundeadkeys"
+-
+-#~ msgid "no(sundeadkeys) - No decription"
+-#~ msgstr "sundeadkeys"
+-
+-#~ msgid "pl(Sundeadkeys) - No decription"
+-#~ msgstr "Sundeadkeys"
+-
+-#~ msgid "pl(sundeadkeys) - No decription"
+-#~ msgstr "sundeadkeys"
+-
+-#~ msgid "pl2(Sundeadkeys) - No decription"
+-#~ msgstr "Sundeadkeys"
+-
+-#~ msgid "pl2(sundeadkeys) - No decription"
+-#~ msgstr "sundeadkeys"
+-
+-#~ msgid "sapmi(Sundeadkeys) - No decription"
+-#~ msgstr "Sundeadkeys"
+-
+-#~ msgid "sapmi(sundeadkeys) - No decription"
+-#~ msgstr "sundeadkeys"
+-
+-#~ msgid "se(Sundeadkeys) - No decription"
+-#~ msgstr "Sundeadkeys"
+-
+-#~ msgid "se(fixdollar) - No decription"
+-#~ msgstr "со знаком доллара"
+-
+-#~ msgid "se(sundeadkeys) - No decription"
+-#~ msgstr "sundeadkeys"
+-
+-#~ msgid "se_FI(basic) - No decription"
+-#~ msgstr "простая"
+-
+-#~ msgid "se_NO(basic) - No decription"
+-#~ msgstr "простая"
+-
+-#~ msgid "se_SE(basic) - No decription"
+-#~ msgstr "простая"
+-
+-#~ msgid "tj(winkeys) - No decription"
+-#~ msgstr "cо специальными клавишами"
+-
+-#~ msgid "us(generic101) - No decription"
+-#~ msgstr "простая pc101"
+-
+-#~ msgid "us(pc101compose) - No decription"
+-#~ msgstr "pc101, compose"
+-
+-#~ msgid "us(pc101euro) - No decription"
+-#~ msgstr "pc101 \"европейская\""
+-
+-#~ msgid "us(pc102) - No decription"
+-#~ msgstr "pc102"
+-
+-#~ msgid "us(pc102compose) - No decription"
+-#~ msgstr "pc102, compose"
+-
+-#~ msgid "us(pc102euro) - No decription"
+-#~ msgstr "pc102 \"европейская\""
+-
+-#~ msgid "us(pc104) - No decription"
+-#~ msgstr "pc104"
+-
+-#~ msgid "us(pc104compose) - No decription"
+-#~ msgstr "pc104, compose"
+-
+-#~ msgid "us(pc104euro) - No decription"
+-#~ msgstr "pc104 \"европейская\""
+-
+-#~ msgid "us(pc105) - No decription"
+-#~ msgstr "pc105"
+-
+-#~ msgid "us(pc105compose) - No decription"
+-#~ msgstr "pc105, compose"
+-
+-#~ msgid "us(pc105euro) - No decription"
+-#~ msgstr "pc105 \"европейская\""
+-
+-#~ msgid "us(pc_universal) - No decription"
+-#~ msgstr "универсальная"
+-
+-#~ msgid "us(pc_universal_compose) - No decription"
+-#~ msgstr "универсальная, compose"
+-
+-#~ msgid "us(pc_universal_euro) - No decription"
+-#~ msgstr "универсальная \"европейская\""
+-
+-#~ msgid "vn(generic101) - No decription"
+-#~ msgstr "простая pc101"
+-
+-#~ msgid "vn(pc101) - No decription"
+-#~ msgstr "pc101"
+-
+-#~ msgid "vn(pc101compose) - No decription"
+-#~ msgstr "pc101, compose"
+-
+-#~ msgid "vn(pc101euro) - No decription"
+-#~ msgstr "pc101 \"европейская\""
+-
+-#~ msgid "vn(pc102) - No decription"
+-#~ msgstr "pc102"
+-
+-#~ msgid "vn(pc102compose) - No decription"
+-#~ msgstr "pc102, compose"
+-
+-#~ msgid "vn(pc102euro) - No decription"
+-#~ msgstr "pc102 \"европейская\""
+-
+-#~ msgid "vn(pc104) - No decription"
+-#~ msgstr "pc104"
+-
+-#~ msgid "vn(pc104compose) - No decription"
+-#~ msgstr "pc104, compose"
+-
+-#~ msgid "vn(pc104euro) - No decription"
+-#~ msgstr "pc104 \"европейская\""
+-
+-#~ msgid "vn(pc105) - No decription"
+-#~ msgstr "pc105"
+-
+-#~ msgid "vn(pc105compose) - No decription"
+-#~ msgstr "pc105, compose"
+-
+-#~ msgid "vn(pc105euro) - No decription"
+-#~ msgstr "pc105 \"европейская\""
+-
+-#~ msgid "vn(pc_universal) - No decription"
+-#~ msgstr "универсальная"
+-
+-#~ msgid "vn(toggle) - No decription"
+-#~ msgstr "с переключением"
Index: xkb-data/po/rw.po
===================================================================
--- xkb-data.orig/po/rw.po
@@ -76353,10 +77272,25 @@
+++ xkb-data/symbols/altwin
@@ -1,4 +1,4 @@
-// $XKeyboardConfig: xkbdesc/symbols/altwin,v 1.4 2005/10/01 12:20:31 svu Exp $
-+// $XKeyboardConfig: xkbdesc/symbols/altwin,v 1.7 2006-09-06 17:10:19 svu Exp $
++// $XKeyboardConfig: xkbdesc/symbols/altwin,v 1.8 2006-10-09 21:20:45 svu Exp $
// $XFree86: xc/programs/xkbcomp/symbols/altwin,v 1.5 2003/12/03 14:09:08 pascal Exp $
+@@ -12,10 +12,10 @@
+
+ partial modifier_keys
+ xkb_symbols "meta_win" {
+- key <LALT> { [ Alt_L ] };
+- key <RALT> { [ Alt_R ] };
+- key <LWIN> { [ Meta_L ] };
+- key <RWIN> { [ Meta_R ] };
++ key <LALT> { [ Alt_L, Alt_L ] };
++ key <RALT> { [ Alt_R, Alt_R ] };
++ key <LWIN> { [ Meta_L ] };
++ key <RWIN> { [ Meta_R ] };
+ modifier_map Mod1 { Alt_L, Alt_R };
+ modifier_map Mod4 { <META>, Meta_L, Meta_R };
+ };
@@ -58,3 +58,11 @@
modifier_map Mod1 { Alt_L, Alt_R, Meta_L, Meta_R };
modifier_map Mod4 { Super_L, Super_R };
@@ -77152,7 +78086,7 @@
// based on a keyboard map from an 'xkb/symbols/de' file
//
-// $XKeyboardConfig: xkbdesc/symbols/de,v 1.10 2006/02/26 03:33:08 svu Exp $
-+// $XKeyboardConfig: xkbdesc/symbols/de,v 1.14 2006-10-03 22:47:43 svu Exp $
++// $XKeyboardConfig: xkbdesc/symbols/de,v 1.15 2006-10-08 22:43:01 svu Exp $
// $XFree86: xc/programs/xkbcomp/symbols/de,v 1.6 2003/09/08 13:12:51 pascal Exp $
default
@@ -77307,7 +78241,7 @@
+
+partial alphanumeric_keys
+xkb_symbols "mac_nodeadkeys" {
-+ // modify the default German layout to not have any dead keys
++ // modify the standard German mac layout to not have any dead keys
+ include "de(mac)"
+ name[Group1]= "Germany - Macintosh, eliminate dead keys";
+ key <AE04> { [ 4, dollar, onequarter, currency ] };
@@ -79974,35 +80908,48 @@
+++ xkb-data/symbols/latin
@@ -1,4 +1,4 @@
-// $XKeyboardConfig: xkbdesc/symbols/latin,v 1.3 2004/10/09 17:40:26 svu Exp $
-+// $XKeyboardConfig: xkbdesc/symbols/latin,v 1.3 2004-10-09 17:40:26 svu Exp $
++// $XKeyboardConfig: xkbdesc/symbols/latin,v 1.4 2006-10-09 21:37:13 svu Exp $
// Common Latin alphabet layout
//
+@@ -50,8 +50,8 @@
+ key <AB01> { [ z, Z, guillemotleft, less ] };
+ key <AB02> { [ x, X, guillemotright, greater ] };
+ key <AB03> { [ c, C, cent, copyright ] };
+- key <AB04> { [ v, V, leftdoublequotemark, grave ] };
+- key <AB05> { [ b, B, rightdoublequotemark, apostrophe ] };
++ key <AB04> { [ v, V, leftdoublequotemark, leftsinglequotemark ] };
++ key <AB05> { [ b, B, rightdoublequotemark, rightsinglequotemark ] };
+ key <AB06> { [ n, N ] };
+ key <AB07> { [ m, M, mu, masculine ] };
+ key <AB08> { [ comma, less, horizconnector, multiply ] };
Index: xkb-data/symbols/level3
===================================================================
--- xkb-data.orig/symbols/level3
+++ xkb-data/symbols/level3
@@ -1,4 +1,4 @@
-// $XKeyboardConfig: xkbdesc/symbols/level3,v 1.9 2005/11/26 23:19:41 svu Exp $
-+// $XKeyboardConfig: xkbdesc/symbols/level3,v 1.12 2006-09-18 13:51:37 svu Exp $
++// $XKeyboardConfig: xkbdesc/symbols/level3,v 1.14 2006-10-09 21:53:27 svu Exp $
// these variants assign various XKB keycodes to ISO_Level3_Shift so that
// the third shift level can be reached
-@@ -17,6 +17,14 @@
- modifier_map Mod5 { ISO_Level3_Shift };
- };
-
+@@ -14,7 +14,15 @@
+ type[Group1]="ONE_LEVEL",
+ symbols[Group1] = [ ISO_Level3_Shift ]
+ };
+- modifier_map Mod5 { ISO_Level3_Shift };
++ modifier_map Mod5 { <RALT> };
++};
++
+partial modifier_keys
+xkb_symbols "ralt_switch_multikey" {
+ key <RALT> {
+ type[Group1]="TWO_LEVEL",
+ symbols[Group1] = [ ISO_Level3_Shift, Multi_key ]
+ };
-+};
-+
+ };
+
// special case or right Alt switch - for use with grp:alts_toggle
- //
- partial hidden modifier_keys
@@ -26,7 +34,7 @@
symbols[Group1] = [ Alt_L, ISO_Prev_Group, ISO_Prev_Group ]
};
@@ -80012,10 +80959,32 @@
symbols[Group1] = [ ISO_Level3_Shift, ISO_Next_Group ],
virtualMods= AltGr
};
-@@ -72,20 +80,16 @@
- modifier_map Mod5 { ISO_Level3_Shift };
+@@ -47,7 +55,7 @@
+ type[Group1]="ONE_LEVEL",
+ symbols[Group1] = [ ISO_Level3_Shift ]
+ };
+- modifier_map Mod5 { ISO_Level3_Shift };
++ modifier_map Mod5 { <LALT> };
};
+ // using the level(switch) map, the right Control key temporarily
+@@ -58,7 +66,7 @@
+ type[Group1]="ONE_LEVEL",
+ symbols[Group1] = [ ISO_Level3_Shift ]
+ };
+- modifier_map Mod5 { ISO_Level3_Shift };
++ modifier_map Mod5 { <RCTL> };
+ };
+
+ // using the level(menu_switch) map, the Menu key temporarily
+@@ -69,30 +77,26 @@
+ type[Group1]="ONE_LEVEL",
+ symbols[Group1] = [ ISO_Level3_Shift ]
+ };
+- modifier_map Mod5 { ISO_Level3_Shift };
++ modifier_map Mod5 { <MENU> };
+ };
+
-// using the level(win_switch) map, the either Windows' logo key
-// temporarily chooses the third shift level. If you use this map,
-// you should define your keyboard as pc101 or pc102 instead of pc104
@@ -80037,10 +81006,21 @@
partial modifier_keys
xkb_symbols "lwin_switch" {
key <LWIN> {
-@@ -107,3 +111,15 @@
+ type[Group1]="ONE_LEVEL",
+ symbols[Group1] = [ ISO_Level3_Shift ]
};
- modifier_map Mod5 { ISO_Level3_Shift };
+- modifier_map Mod5 { ISO_Level3_Shift };
++ modifier_map Mod5 { <LWIN> };
};
+
+ // using the level(rwin_switch) map, the right Windows' logo key
+@@ -105,5 +109,17 @@
+ type[Group1]="ONE_LEVEL",
+ symbols[Group1] = [ ISO_Level3_Shift ]
+ };
+- modifier_map Mod5 { ISO_Level3_Shift };
++ modifier_map Mod5 { <RWIN> };
++};
+
+// using the level3(enter_switch) map, the Enter key on the keypad
+// temporarily chooses the third shift level. This is especially
@@ -80051,8 +81031,8 @@
+ type[Group1]="ONE_LEVEL",
+ symbols[Group1] = [ ISO_Level3_Shift ]
+ };
-+ modifier_map Mod5 { ISO_Level3_Shift };
-+};
++ modifier_map Mod5 { <KPEN> };
+ };
Index: xkb-data/symbols/level5
===================================================================
--- xkb-data.orig/symbols/level5
@@ -83124,7 +84104,7 @@
+++ xkb-data/symbols/us
@@ -1,4 +1,4 @@
-// $XKeyboardConfig: xkbdesc/symbols/us,v 1.16 2006/01/31 22:49:05 svu Exp $
-+// $XKeyboardConfig: xkbdesc/symbols/us,v 1.21 2006-10-03 22:47:43 svu Exp $
++// $XKeyboardConfig: xkbdesc/symbols/us,v 1.22 2006-10-09 21:37:13 svu Exp $
//
// $XdotOrg: xc/programs/xkbcomp/symbols/us,v 1.1.4.3 2004/03/05 13:41:33 eich Exp $
@@ -83145,6 +84125,17 @@
// End alphanumeric section
};
+@@ -160,8 +157,8 @@
+ key <TLDE> { [ dead_grave, dead_tilde, grave, asciitilde ] };
+ key <AE05> { [ 5, percent, EuroSign ] };
+ key <AE06> { [ 6, dead_circumflex, asciicircum, asciicircum ] };
+- key <AE09> { [ 9, parenleft, dead_breve, dead_breve ] };
+- key <AE10> { [ 0, parenright, dead_abovering, dead_abovering] };
++ key <AE09> { [ 9, parenleft, leftsinglequotemark, dead_breve ] };
++ key <AE10> { [ 0, parenright, rightsinglequotemark, dead_abovering ] };
+ key <AE11> { [ minus, underscore, dead_macron, dead_belowdot ] };
+ key <AE12> { [ equal, plus, dead_doubleacute, dead_horn ] };
+
@@ -369,6 +366,69 @@
[ dead_acute, dead_diaeresis ] };
};
@@ -83493,33 +84484,34 @@
+++ xkb-data/types/complete
@@ -1,4 +1,4 @@
-// $XKeyboardConfig: xkbdesc/types/complete,v 1.3 2005/10/17 00:42:11 svu Exp $
-+// $XKeyboardConfig: xkbdesc/types/complete,v 1.4 2006-09-17 20:26:16 svu Exp $
++// $XKeyboardConfig: xkbdesc/types/complete,v 1.5 2006-10-07 21:52:44 svu Exp $
// $Xorg: complete,v 1.3 2000/08/17 19:54:48 cpqbld Exp $
//
//
-@@ -8,6 +8,7 @@
-
- default xkb_types "complete" {
- include "basic"
+@@ -13,4 +13,5 @@
+ include "iso9995"
+ include "level5"
+ include "extra"
+ include "numpad"
- include "mousekeys"
- include "pc"
- include "iso9995"
+ };
Index: xkb-data/types/default
===================================================================
--- xkb-data.orig/types/default
+++ xkb-data/types/default
-@@ -1,8 +1,9 @@
+@@ -1,4 +1,4 @@
-// $XKeyboardConfig: xkbdesc/types/default,v 1.4 2005/10/17 00:42:11 svu Exp $
-+// $XKeyboardConfig: xkbdesc/types/default,v 1.5 2006-09-17 20:26:16 svu Exp $
++// $XKeyboardConfig: xkbdesc/types/default,v 1.6 2006-10-07 21:52:44 svu Exp $
// $Xorg: default,v 1.3 2000/08/17 19:54:48 cpqbld Exp $
default xkb_types "default" {
- include "basic"
-+ include "numpad"
+@@ -6,6 +6,7 @@
include "pc"
include "iso9995"
include "extra"
++ include "numpad"
+ include "level5"
+ include "mousekeys"
+ };
Index: xkb-data/types/extra
===================================================================
--- xkb-data.orig/types/extra
@@ -83640,11 +84632,10 @@
===================================================================
--- xkb-data.orig/types/numpad
+++ xkb-data/types/numpad
-@@ -1,6 +1,33 @@
+@@ -1,6 +1,32 @@
-xkb_types "microsoft" {
-+default
-+xkb_types "pc" {
++partial default xkb_types "pc" {
+ type "KEYPAD" {
+ modifiers = Shift+NumLock;
+ map[None] = Level1;
@@ -83658,7 +84649,7 @@
+};
+
+// On Mac keypads, level 1 and 2 are swapped
-+xkb_types "mac" {
++partial xkb_types "mac" {
+ type "KEYPAD" {
+ modifiers = Shift+NumLock;
+ map[None] = Level2;
@@ -83671,11 +84662,11 @@
+ include "extra(mac_keypad)"
+};
-+xkb_types "microsoft" {
++partial xkb_types "microsoft" {
type "KEYPAD" {
modifiers = Shift+NumLock;
map[None] = Level1;
-@@ -9,4 +36,6 @@
+@@ -9,4 +35,6 @@
level_name[Level1] = "Base";
level_name[Level2] = "Number";
};
Modified: trunk/data/xkb-data/debian/patches/fix_xkbcomp_crash.diff
===================================================================
--- trunk/data/xkb-data/debian/patches/fix_xkbcomp_crash.diff 2006-10-09 21:31:48 UTC (rev 3695)
+++ trunk/data/xkb-data/debian/patches/fix_xkbcomp_crash.diff 2006-10-09 21:57:30 UTC (rev 3696)
@@ -1,5 +1,7 @@
-Current CVS triggers nasty bugs in xkbcomp. This patch prevents
-xkbcomp from crashing.
+At some point, CVS triggered nasty bugs in xkbcomp. A patch has been
+submitted upstream, but a different fix has been applied. For now
+fix_xkbcomp_crash.diff is disabled, but if xkbcomp crashes again,
+it can be reenabled.
Submitted upstream: https://bugs.freedesktop.org/show_bug.cgi?id=8402
@@ -7,18 +9,19 @@
===================================================================
--- xkb-data.orig/types/numpad
+++ xkb-data/types/numpad
-@@ -1,7 +1,9 @@
+@@ -1,6 +1,9 @@
- default
- xkb_types "pc" {
+-partial default xkb_types "pc" {
- type "KEYPAD" {
++default
++xkb_types "pc" {
+ virtual_modifiers LevelThree;
+
+ override type "KEYPAD" {
modifiers = Shift+NumLock;
map[None] = Level1;
map[Shift] = Level2;
-@@ -10,12 +12,29 @@
+@@ -9,12 +12,29 @@
level_name[Level1] = "Base";
level_name[Level2] = "Number";
};
@@ -42,15 +45,16 @@
};
// On Mac keypads, level 1 and 2 are swapped
- xkb_types "mac" {
+-partial xkb_types "mac" {
- type "KEYPAD" {
++xkb_types "mac" {
+ virtual_modifiers LevelThree;
+
+ override type "KEYPAD" {
modifiers = Shift+NumLock;
map[None] = Level2;
map[Shift] = Level1;
-@@ -24,11 +43,28 @@
+@@ -23,11 +43,28 @@
level_name[Level2] = "Base";
level_name[Level1] = "Number";
};
@@ -73,15 +77,16 @@
+ };
};
- xkb_types "microsoft" {
+-partial xkb_types "microsoft" {
- type "KEYPAD" {
++xkb_types "microsoft" {
+ virtual_modifiers LevelThree;
+
+ override type "KEYPAD" {
modifiers = Shift+NumLock;
map[None] = Level1;
preserve[Shift] = Shift;
-@@ -36,6 +72,21 @@
+@@ -35,6 +72,21 @@
level_name[Level1] = "Base";
level_name[Level2] = "Number";
};
@@ -108,8 +113,8 @@
===================================================================
--- xkb-data.orig/types/extra
+++ xkb-data/types/extra
-@@ -51,6 +51,23 @@
- level_name[Level4] = "Shift Alt";
+@@ -85,6 +85,23 @@
+ level_name[Level4] = "Ctrl+Alt";
};
+ // This enables the four level shifting also for the keypad.
@@ -132,7 +137,7 @@
// Special type for keys used in Serbian Latin Unicode map
// It makes it possible to use all three forms of latin letters
// present in Unicode that are made up of two separate letters
-@@ -73,46 +90,3 @@
+@@ -107,46 +124,3 @@
level_name[Level4] = "Shift AltGr";
};
};
@@ -197,35 +202,3 @@
+ level_name[Level2] = "Number";
+ };
};
-Index: xkb-data/types/complete
-===================================================================
---- xkb-data.orig/types/complete
-+++ xkb-data/types/complete
-@@ -8,10 +8,10 @@
-
- default xkb_types "complete" {
- include "basic"
-- include "numpad"
- include "mousekeys"
- include "pc"
- include "iso9995"
- include "level5"
- include "extra"
-+ include "numpad"
- };
-Index: xkb-data/types/default
-===================================================================
---- xkb-data.orig/types/default
-+++ xkb-data/types/default
-@@ -3,10 +3,10 @@
-
- default xkb_types "default" {
- include "basic"
-- include "numpad"
- include "pc"
- include "iso9995"
- include "extra"
-+ include "numpad"
- include "level5"
- include "mousekeys"
- };
Deleted: trunk/data/xkb-data/debian/patches/latin_quotes.diff
===================================================================
--- trunk/data/xkb-data/debian/patches/latin_quotes.diff 2006-10-09 21:31:48 UTC (rev 3695)
+++ trunk/data/xkb-data/debian/patches/latin_quotes.diff 2006-10-09 21:57:30 UTC (rev 3696)
@@ -1,37 +0,0 @@
-Grave and apostrophe on the 4th level can be provided via simpler
-keystrokes. They were historically provided as alternative quotes,
-but these one are better alternatives now that Unicode is common.
-Closes: #308196 Thanks Mark Sheppard
-
-Submitted upstream: https://bugs.freedesktop.org/show_bug.cgi?id=8122
-
-Index: xkb-data/symbols/latin
-===================================================================
---- xkb-data.orig/symbols/latin
-+++ xkb-data/symbols/latin
-@@ -50,8 +50,8 @@
- key <AB01> { [ z, Z, guillemotleft, less ] };
- key <AB02> { [ x, X, guillemotright, greater ] };
- key <AB03> { [ c, C, cent, copyright ] };
-- key <AB04> { [ v, V, leftdoublequotemark, grave ] };
-- key <AB05> { [ b, B, rightdoublequotemark, apostrophe ] };
-+ key <AB04> { [ v, V, leftdoublequotemark, leftsinglequotemark ] };
-+ key <AB05> { [ b, B, rightdoublequotemark, rightsinglequotemark ] };
- key <AB06> { [ n, N ] };
- key <AB07> { [ m, M, mu, masculine ] };
- key <AB08> { [ comma, less, horizconnector, multiply ] };
-Index: xkb-data/symbols/us
-===================================================================
---- xkb-data.orig/symbols/us
-+++ xkb-data/symbols/us
-@@ -157,8 +157,8 @@
- key <TLDE> { [ dead_grave, dead_tilde, grave, asciitilde ] };
- key <AE05> { [ 5, percent, EuroSign ] };
- key <AE06> { [ 6, dead_circumflex, asciicircum, asciicircum ] };
-- key <AE09> { [ 9, parenleft, dead_breve, dead_breve ] };
-- key <AE10> { [ 0, parenright, dead_abovering, dead_abovering] };
-+ key <AE09> { [ 9, parenleft, leftsinglequotemark, dead_breve ] };
-+ key <AE10> { [ 0, parenright, rightsinglequotemark, dead_abovering ] };
- key <AE11> { [ minus, underscore, dead_macron, dead_belowdot ] };
- key <AE12> { [ equal, plus, dead_doubleacute, dead_horn ] };
-
Modified: trunk/data/xkb-data/debian/patches/series
===================================================================
--- trunk/data/xkb-data/debian/patches/series 2006-10-09 21:31:48 UTC (rev 3695)
+++ trunk/data/xkb-data/debian/patches/series 2006-10-09 21:57:30 UTC (rev 3696)
@@ -1,9 +1,8 @@
cvs.diff
-fix_xkbcomp_crash.diff
+#fix_xkbcomp_crash.diff
clean.diff
docs.diff
sclk_toggle.diff
-latin_quotes.diff
mac_poweroff.diff
bz1576.diff
unhide_lv3_enter_switch.diff
Reply to: