X Strike Force X.Org X11 SVN commit: r2403 - in trunk/data/xkb-data: debian debian/patches docs po rules symbols
Author: barbier
Date: 2006-07-02 16:30:59 -0400 (Sun, 02 Jul 2006)
New Revision: 2403
Added:
trunk/data/xkb-data/debian/patches/
trunk/data/xkb-data/debian/patches/docs.diff
trunk/data/xkb-data/debian/patches/fr.po.diff
trunk/data/xkb-data/debian/patches/quiltrc
trunk/data/xkb-data/debian/patches/sclk_toggle.diff
trunk/data/xkb-data/debian/patches/series
Modified:
trunk/data/xkb-data/debian/changelog
trunk/data/xkb-data/debian/control
trunk/data/xkb-data/debian/rules
trunk/data/xkb-data/docs/README.config
trunk/data/xkb-data/po/fr.po
trunk/data/xkb-data/rules/base
trunk/data/xkb-data/rules/base.o_s.part
trunk/data/xkb-data/rules/base.xml.in
trunk/data/xkb-data/symbols/group
Log:
* debian/control: Use quilt to manage changes.
Modified: trunk/data/xkb-data/debian/changelog
===================================================================
--- trunk/data/xkb-data/debian/changelog 2006-07-02 17:26:50 UTC (rev 2402)
+++ trunk/data/xkb-data/debian/changelog 2006-07-02 20:30:59 UTC (rev 2403)
@@ -4,8 +4,10 @@
* debian/control: Bump Standards-Version to 3.7.2, no changes needed.
- -- Denis Barbier <barbier@debian.org> Fri, 16 Jun 2006 11:49:31 +0200
+ * debian/control: Use quilt to manage changes.
+ -- Denis Barbier <barbier@debian.org> Sun, 2 Jul 2006 22:11:44 +0200
+
xkeyboard-config (0.8-5) unstable; urgency=low
* Add a symlink rules/xfree86 -> rules/base. Thanks Daniel Stone.
Modified: trunk/data/xkb-data/debian/control
===================================================================
--- trunk/data/xkb-data/debian/control 2006-07-02 17:26:50 UTC (rev 2402)
+++ trunk/data/xkb-data/debian/control 2006-07-02 20:30:59 UTC (rev 2403)
@@ -3,7 +3,7 @@
Priority: extra
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: Denis Barbier <barbier@debian.org>
-Build-Depends: debhelper (>= 4.0.0)
+Build-Depends: debhelper (>= 4.0.0), quilt
Build-Depends-Indep: libxml-parser-perl
Standards-Version: 3.7.2
Added: trunk/data/xkb-data/debian/patches/docs.diff
===================================================================
--- trunk/data/xkb-data/debian/patches/docs.diff 2006-07-02 17:26:50 UTC (rev 2402)
+++ trunk/data/xkb-data/debian/patches/docs.diff 2006-07-02 20:30:59 UTC (rev 2403)
@@ -0,0 +1,11 @@
+--- xkeyboard-config-0.8.orig/docs/README.config
++++ xkeyboard-config-0.8/docs/README.config
+@@ -41,7 +41,7 @@
+ The proper rules file depends on your vendor. In reality, the commonest file
+ of rules is xfree86. For each rules file there is a description file named
+ <vendor-rules>.lst, for instance xfree86.lst which is located in xkb configu-
+-ration subdirectory rules (for example /etc/X11/xkb/rules).
++ration subdirectory rules (for example /usr/share/X11/xkb/rules).
+
+ 2.1 Basic Configuration
+
Added: trunk/data/xkb-data/debian/patches/fr.po.diff
===================================================================
--- trunk/data/xkb-data/debian/patches/fr.po.diff 2006-07-02 17:26:50 UTC (rev 2402)
+++ trunk/data/xkb-data/debian/patches/fr.po.diff 2006-07-02 20:30:59 UTC (rev 2403)
@@ -0,0 +1,552 @@
+--- xkeyboard-config-0.8.orig/po/fr.po
++++ xkeyboard-config-0.8/po/fr.po
+@@ -6,10 +6,10 @@
+ #
+ msgid ""
+ msgstr ""
+-"Project-Id-Version: xkeyboard-config 0.6\n"
++"Project-Id-Version: xkeyboard-config 0.8\n"
+ "Report-Msgid-Bugs-To: \n"
+ "POT-Creation-Date: 2006-03-04 17:41+0000\n"
+-"PO-Revision-Date: 2005-10-10 23:35+0200\n"
++"PO-Revision-Date: 2006-03-08 22:28+0100\n"
+ "Last-Translator: Denis Barbier <barbier@linuxfr.org>\n"
+ "Language-Team: French <traduc@traduc.org>\n"
+ "MIME-Version: 1.0\n"
+@@ -131,16 +131,15 @@
+
+ #: ../rules/base.xml.in.h:29
+ msgid "Afg"
+-msgstr ""
++msgstr "Afg"
+
+ #: ../rules/base.xml.in.h:30
+-#, fuzzy
+ msgid "Afghanistan"
+-msgstr "Pakistan"
++msgstr "Afghanistan"
+
+ #: ../rules/base.xml.in.h:31
+ msgid "Akan"
+-msgstr ""
++msgstr "Akan"
+
+ #: ../rules/base.xml.in.h:32
+ msgid "Alb"
+@@ -159,7 +158,6 @@
+ msgstr "Alt est obtenu avec la touche Logo de droite, et Super avec Menu."
+
+ #: ../rules/base.xml.in.h:36
+-#, fuzzy
+ msgid "Alt+Ctrl changes group."
+ msgstr "Alt+Ctrl change de groupe."
+
+@@ -192,13 +190,12 @@
+ msgstr "Autre, sans touches mortes"
+
+ #: ../rules/base.xml.in.h:44
+-#, fuzzy
+ msgid "And"
+-msgstr "Ind"
++msgstr "And"
+
+ #: ../rules/base.xml.in.h:45
+ msgid "Andorra"
+-msgstr ""
++msgstr "Andorre"
+
+ #: ../rules/base.xml.in.h:46
+ msgid "Apostrophe (') variant"
+@@ -346,7 +343,7 @@
+
+ #: ../rules/base.xml.in.h:82
+ msgid "Cambodia"
+-msgstr ""
++msgstr "Cambodge"
+
+ #: ../rules/base.xml.in.h:83
+ msgid "Can"
+@@ -357,9 +354,8 @@
+ msgstr "Canada"
+
+ #: ../rules/base.xml.in.h:85
+-#, fuzzy
+ msgid "Caps Lock is Compose."
+-msgstr "Menu est Compose."
++msgstr "Verr. maj. est Compose."
+
+ #: ../rules/base.xml.in.h:86
+ msgid "CapsLock LED shows alternative group."
+@@ -406,7 +402,7 @@
+
+ #: ../rules/base.xml.in.h:96
+ msgid "Catalan variant with middle-dot L"
+-msgstr ""
++msgstr "Catalan avec L point médian"
+
+ #: ../rules/base.xml.in.h:97
+ msgid "Che"
+@@ -421,9 +417,8 @@
+ msgstr "Cherry Blue Line CyBo@rd (autre option)"
+
+ #: ../rules/base.xml.in.h:100
+-#, fuzzy
+ msgid "Cherry CyBo@rd USB-Hub"
+-msgstr "Cherry Blue Line CyBo@rd"
++msgstr "Cherry CyBo@rd USB-Hub"
+
+ #: ../rules/base.xml.in.h:101
+ msgid "Cherry CyMotion Master Linux"
+@@ -470,22 +465,18 @@
+ msgstr "Croatie"
+
+ #: ../rules/base.xml.in.h:112
+-#, fuzzy
+ msgid "Ctrl key at bottom left"
+ msgstr "Touche Ctrl en bas à gauche"
+
+ #: ../rules/base.xml.in.h:113
+-#, fuzzy
+ msgid "Ctrl key at left of 'A'"
+ msgstr "Touche Ctrl à la gauche du « A »"
+
+ #: ../rules/base.xml.in.h:114
+-#, fuzzy
+ msgid "Ctrl key position"
+ msgstr "Position de la touche Contrôle"
+
+ #: ../rules/base.xml.in.h:115
+-#, fuzzy
+ msgid "Ctrl+Shift changes group."
+ msgstr "Ctrl+Maj. change de groupe."
+
+@@ -522,9 +513,8 @@
+ msgstr "Dell PC 101 touches"
+
+ #: ../rules/base.xml.in.h:124
+-#, fuzzy
+ msgid "Dell USB Multimedia Keybard"
+-msgstr "Multimedia Super Power"
++msgstr "Dell USB Multimedia"
+
+ #: ../rules/base.xml.in.h:125
+ msgid "Denmark"
+@@ -567,9 +557,8 @@
+ msgstr "Ennyah DKB-1008"
+
+ #: ../rules/base.xml.in.h:135
+-#, fuzzy
+ msgid "Epo"
+-msgstr "Esp"
++msgstr "Epo"
+
+ #: ../rules/base.xml.in.h:136
+ msgid "Esp"
+@@ -577,7 +566,7 @@
+
+ #: ../rules/base.xml.in.h:137
+ msgid "Esperanto"
+-msgstr ""
++msgstr "Esperanto"
+
+ #: ../rules/base.xml.in.h:138
+ msgid "Est"
+@@ -592,9 +581,8 @@
+ msgstr "Everex STEPnote"
+
+ #: ../rules/base.xml.in.h:141
+-#, fuzzy
+ msgid "Ewe"
+-msgstr "Sué"
++msgstr "Ewe"
+
+ #: ../rules/base.xml.in.h:142
+ msgid "Extended"
+@@ -654,7 +642,7 @@
+
+ #: ../rules/base.xml.in.h:156
+ msgid "Fula"
+-msgstr ""
++msgstr "Peul"
+
+ #: ../rules/base.xml.in.h:157
+ msgid "GBr"
+@@ -662,7 +650,7 @@
+
+ #: ../rules/base.xml.in.h:158
+ msgid "Ga"
+-msgstr ""
++msgstr "Ga"
+
+ #: ../rules/base.xml.in.h:159
+ msgid "Generic 101-key PC"
+@@ -681,9 +669,8 @@
+ msgstr "PC générique 105 touches (intl)"
+
+ #: ../rules/base.xml.in.h:163
+-#, fuzzy
+ msgid "Genius Comfy KB-12e"
+-msgstr "Genius Comfy KB-21e-Scroll"
++msgstr "Genius Comfy KB-12e"
+
+ #: ../rules/base.xml.in.h:164
+ msgid "Genius Comfy KB-16M / Genius MM Keyboard KWD-910"
+@@ -714,13 +701,12 @@
+ msgstr "Allemagne"
+
+ #: ../rules/base.xml.in.h:171
+-#, fuzzy
+ msgid "Gha"
+-msgstr "Tha"
++msgstr "Gha"
+
+ #: ../rules/base.xml.in.h:172
+ msgid "Ghana"
+-msgstr ""
++msgstr "Ghana"
+
+ #: ../rules/base.xml.in.h:173
+ msgid "Gre"
+@@ -748,7 +734,7 @@
+
+ #: ../rules/base.xml.in.h:179
+ msgid "Hausa"
+-msgstr ""
++msgstr "Haoussa"
+
+ #: ../rules/base.xml.in.h:180
+ msgid "Hewlett-Packard Internet Keyboard"
+@@ -904,20 +890,19 @@
+
+ #: ../rules/base.xml.in.h:218
+ msgid "Kaz"
+-msgstr ""
++msgstr "Kaz"
+
+ #: ../rules/base.xml.in.h:219
+ msgid "Kazakh with Russian"
+-msgstr ""
++msgstr "Kazakh avec russe"
+
+ #: ../rules/base.xml.in.h:220
+-#, fuzzy
+ msgid "Kazakhstan"
+-msgstr "Pakistan"
++msgstr "Kazakhstan"
+
+ #: ../rules/base.xml.in.h:221
+ msgid "Keypad"
+-msgstr ""
++msgstr "Pavé numérique"
+
+ #: ../rules/base.xml.in.h:222
+ msgid "Keytronic FlexPro"
+@@ -925,7 +910,7 @@
+
+ #: ../rules/base.xml.in.h:223
+ msgid "Khm"
+-msgstr ""
++msgstr "Khm"
+
+ #: ../rules/base.xml.in.h:224
+ msgid "Kyr"
+@@ -956,14 +941,12 @@
+ msgstr "Compaq portable Internet (p.e. Presario)"
+
+ #: ../rules/base.xml.in.h:231
+-#, fuzzy
+ msgid "Laptop/notebook Dell Inspiron 6xxx/8xxx"
+-msgstr "Dell Inspiron 8xxx"
++msgstr "Dell Inspiron 6xxx/8xxx"
+
+ #: ../rules/base.xml.in.h:232
+-#, fuzzy
+ msgid "Laptop/notebook eMachines m68xx"
+-msgstr "Dell Inspiron 8xxx"
++msgstr "eMachines m68xx"
+
+ #: ../rules/base.xml.in.h:233
+ msgid "Latin"
+@@ -1019,7 +1002,7 @@
+
+ #: ../rules/base.xml.in.h:246
+ msgid "Left handed Dvorak"
+-msgstr ""
++msgstr "Dvorak pour gaucher"
+
+ #: ../rules/base.xml.in.h:247
+ msgid "Lithuania"
+@@ -1098,9 +1081,8 @@
+ msgstr "Lva"
+
+ #: ../rules/base.xml.in.h:266
+-#, fuzzy
+ msgid "Macedonia"
+-msgstr "Macédonien"
++msgstr "Macédoine"
+
+ #: ../rules/base.xml.in.h:267
+ msgid "Macintosh"
+@@ -1111,14 +1093,12 @@
+ msgstr "Macintosh ancien"
+
+ #: ../rules/base.xml.in.h:269
+-#, fuzzy
+ msgid "Make CapsLock an additional Ctrl."
+ msgstr "Faire de la touche Verr. maj. une touche Ctrl supplémentaire."
+
+ #: ../rules/base.xml.in.h:270
+-#, fuzzy
+ msgid "Mal"
+-msgstr "Malte"
++msgstr "Mal"
+
+ #: ../rules/base.xml.in.h:271
+ msgid "Malayalam"
+@@ -1126,7 +1106,7 @@
+
+ #: ../rules/base.xml.in.h:272
+ msgid "Maldives"
+-msgstr ""
++msgstr "Maldives"
+
+ #: ../rules/base.xml.in.h:273
+ msgid "Malta"
+@@ -1229,9 +1209,8 @@
+ msgstr "Multilingue"
+
+ #: ../rules/base.xml.in.h:298
+-#, fuzzy
+ msgid "Multilingual, first part"
+-msgstr "Multilingue, partie 2"
++msgstr "Multilingue, partie 1"
+
+ #: ../rules/base.xml.in.h:299
+ msgid "Multilingual, second part"
+@@ -1303,7 +1282,7 @@
+
+ #: ../rules/base.xml.in.h:316
+ msgid "Pashto"
+-msgstr ""
++msgstr "Pashto"
+
+ #: ../rules/base.xml.in.h:317
+ msgid "Pattachote"
+@@ -1331,7 +1310,7 @@
+
+ #: ../rules/base.xml.in.h:323
+ msgid "Power G5"
+-msgstr ""
++msgstr "Power G5"
+
+ #: ../rules/base.xml.in.h:324
+ msgid "PowerPC PS/2"
+@@ -1354,7 +1333,6 @@
+ msgstr "La touche Alt de droite (AltGr) sélectionne le 3e niveau."
+
+ #: ../rules/base.xml.in.h:329
+-#, fuzzy
+ msgid "Press Right Ctrl to choose 3rd level."
+ msgstr "La touche Ctrl de droite sélectionne le 3e niveau."
+
+@@ -1371,13 +1349,12 @@
+ msgstr "N'importe quelle touche Logo sélectionne le 3e niveau."
+
+ #: ../rules/base.xml.in.h:333
+-#, fuzzy
+ msgid "Pro"
+-msgstr "Pol"
++msgstr "Pro"
+
+ #: ../rules/base.xml.in.h:334
+ msgid "Pro Keypad"
+-msgstr ""
++msgstr "Pavé Pro"
+
+ #: ../rules/base.xml.in.h:335
+ msgid "Probhat"
+@@ -1420,7 +1397,6 @@
+ msgstr "Maintenir la touche Ctrl de droite enfoncée change de groupe."
+
+ #: ../rules/base.xml.in.h:345
+-#, fuzzy
+ msgid "Right Ctrl key works as Right Alt."
+ msgstr "La touche Ctrl de droite se comporte comme la touche Alt de droite."
+
+@@ -1442,7 +1418,7 @@
+
+ #: ../rules/base.xml.in.h:350
+ msgid "Right handed Dvorak"
+-msgstr ""
++msgstr "Dvorak pour droitier"
+
+ #: ../rules/base.xml.in.h:351
+ msgid "Romania"
+@@ -1482,15 +1458,15 @@
+
+ #: ../rules/base.xml.in.h:360
+ msgid "Russian with Kazakh"
+-msgstr ""
++msgstr "Russe avec kazakh"
+
+ #: ../rules/base.xml.in.h:361
+ msgid "SCG"
+-msgstr ""
++msgstr "SCG"
+
+ #: ../rules/base.xml.in.h:362
+ msgid "SILVERCREST Multimedia Wireless Keyboard"
+-msgstr ""
++msgstr "SILVERCREST Multimedia Wireless Keyboard"
+
+ #: ../rules/base.xml.in.h:363
+ msgid "SK-1300"
+@@ -1526,7 +1502,7 @@
+
+ #: ../rules/base.xml.in.h:371
+ msgid "Serbia and Montenegro"
+-msgstr ""
++msgstr "Serbie-et-Monténégro"
+
+ #: ../rules/base.xml.in.h:372
+ msgid "Shift with numpad keys works as in MS Windows."
+@@ -1547,11 +1523,11 @@
+
+ #: ../rules/base.xml.in.h:376
+ msgid "South Africa"
+-msgstr ""
++msgstr "Afrique du Sud"
+
+ #: ../rules/base.xml.in.h:377
+ msgid "Southern Uzbek"
+-msgstr ""
++msgstr "Ouzbek du Sud"
+
+ #: ../rules/base.xml.in.h:378
+ msgid "Spain"
+@@ -1606,7 +1582,6 @@
+ msgstr "Svn"
+
+ #: ../rules/base.xml.in.h:392
+-#, fuzzy
+ msgid "Swap Ctrl and CapsLock."
+ msgstr "Interchanger Ctrl et Verr. maj."
+
+@@ -1668,7 +1643,7 @@
+
+ #: ../rules/base.xml.in.h:407
+ msgid "Tatar"
+-msgstr ""
++msgstr "Tatar"
+
+ #: ../rules/base.xml.in.h:408
+ msgid "Telugu"
+@@ -1711,9 +1686,8 @@
+ msgstr "Tur"
+
+ #: ../rules/base.xml.in.h:418
+-#, fuzzy
+ msgid "Turkey"
+-msgstr "Tur"
++msgstr "Turquie"
+
+ #: ../rules/base.xml.in.h:419
+ msgid "Typewriter"
+@@ -1724,19 +1698,16 @@
+ msgstr "Anglais U.S."
+
+ #: ../rules/base.xml.in.h:421
+-#, fuzzy
+ msgid "US keyboard with Bosnian digraphs"
+-msgstr "Clavier US avec lettres roumaines"
++msgstr "Clavier US avec digraphes bosniaques"
+
+ #: ../rules/base.xml.in.h:422
+-#, fuzzy
+ msgid "US keyboard with Bosnian letters"
+-msgstr "Clavier US avec lettres roumaines"
++msgstr "Clavier US avec lettres bosniaques"
+
+ #: ../rules/base.xml.in.h:423
+-#, fuzzy
+ msgid "US keyboard with Croatian digraphs"
+-msgstr "Clavier US avec lettres croates"
++msgstr "Clavier US avec digraphes croates"
+
+ #: ../rules/base.xml.in.h:424
+ msgid "US keyboard with Croatian letters"
+@@ -1751,14 +1722,12 @@
+ msgstr "Clavier US avec lettres maltaises"
+
+ #: ../rules/base.xml.in.h:427
+-#, fuzzy
+ msgid "US keyboard with Slovenian digraphs"
+-msgstr "Clavier US avec lettres roumaines"
++msgstr "Clavier US avec digraphes slovènes"
+
+ #: ../rules/base.xml.in.h:428
+-#, fuzzy
+ msgid "US keyboard with Slovenian letters"
+-msgstr "Clavier US avec lettres roumaines"
++msgstr "Clavier US avec lettres slovènes"
+
+ #: ../rules/base.xml.in.h:429
+ msgid "USA"
+@@ -1786,19 +1755,19 @@
+
+ #: ../rules/base.xml.in.h:435
+ msgid "Use Bosnian digraphs"
+-msgstr ""
++msgstr "Avec digraphes bosniaques"
+
+ #: ../rules/base.xml.in.h:436
+ msgid "Use Croatian digraphs"
+-msgstr ""
++msgstr "Avec digraphes croates"
+
+ #: ../rules/base.xml.in.h:437
+ msgid "Use Slovenian digraphs"
+-msgstr ""
++msgstr "Avec digraphes slovènes"
+
+ #: ../rules/base.xml.in.h:438
+ msgid "Use guillemots for quotes"
+-msgstr ""
++msgstr "Avec guillemets français"
+
+ #: ../rules/base.xml.in.h:439
+ msgid "Use keyboard LED to show alternative group."
+@@ -1847,7 +1816,7 @@
+
+ #: ../rules/base.xml.in.h:450
+ msgid "Zar"
+-msgstr ""
++msgstr "Zar"
+
+ #: ../rules/base.xml.in.h:451
+ msgid "azerty"
+@@ -1884,24 +1853,3 @@
+ #: ../rules/base.xml.in.h:459
+ msgid "si1452"
+ msgstr "si1452"
+-
+-#~ msgid "Turkish"
+-#~ msgstr "Turque"
+-
+-#~ msgid "\"Standard\""
+-#~ msgstr "Standard"
+-
+-#~ msgid "Dhivehi"
+-#~ msgstr "Maldivien"
+-
+-#~ msgid "Div"
+-#~ msgstr "Div"
+-
+-#~ msgid "Serbian"
+-#~ msgstr "Serbe"
+-
+-#~ msgid "Srp"
+-#~ msgstr "Srp"
+-
+-#~ msgid "Tamil INSCRIPT"
+-#~ msgstr "Tamoul INSCRIPT"
Added: trunk/data/xkb-data/debian/patches/quiltrc
===================================================================
--- trunk/data/xkb-data/debian/patches/quiltrc 2006-07-02 17:26:50 UTC (rev 2402)
+++ trunk/data/xkb-data/debian/patches/quiltrc 2006-07-02 20:30:59 UTC (rev 2403)
@@ -0,0 +1,2 @@
+QUILT_PATCHES="debian/patches"
+QUILT_NO_DIFF_TIMESTAMPS=1
Added: trunk/data/xkb-data/debian/patches/sclk_toggle.diff
===================================================================
--- trunk/data/xkb-data/debian/patches/sclk_toggle.diff 2006-07-02 17:26:50 UTC (rev 2402)
+++ trunk/data/xkb-data/debian/patches/sclk_toggle.diff 2006-07-02 20:30:59 UTC (rev 2403)
@@ -0,0 +1,54 @@
+--- xkeyboard-config-0.8.orig/symbols/group
++++ xkeyboard-config-0.8/symbols/group
+@@ -293,3 +293,16 @@
+ virtualMods= AltGr
+ };
+ };
++
++
++// using the group(sclk_toggle) map, pressing the Scroll Lock key
++// toggles groups.
++partial modifier_keys
++xkb_symbols "sclk_toggle" {
++ virtual_modifiers AltGr;
++ key <SCLK> {
++ virtualMods= AltGr,
++ symbols[Group1] = [ ISO_Next_Group ]
++ };
++};
++
+--- xkeyboard-config-0.8.orig/rules/base.o_s.part
++++ xkeyboard-config-0.8/rules/base.o_s.part
+@@ -20,6 +20,7 @@
+ grp:lctrl_toggle = +group(lctrl_toggle)
+ grp:rctrl_toggle = +group(rctrl_toggle)
+ grp:lalt_toggle = +group(lalt_toggle)
++ grp:sclk_toggle = +group(sclk_toggle)
+ lv3:switch = +level3(switch)
+ lv3:ralt_switch = +level3(ralt_switch)
+ lv3:lalt_switch = +level3(lalt_switch)
+--- xkeyboard-config-0.8.orig/rules/base
++++ xkeyboard-config-0.8/rules/base
+@@ -970,6 +970,7 @@
+ grp:lctrl_toggle = +group(lctrl_toggle)
+ grp:rctrl_toggle = +group(rctrl_toggle)
+ grp:lalt_toggle = +group(lalt_toggle)
++ grp:sclk_toggle = +group(sclk_toggle)
+ lv3:switch = +level3(switch)
+ lv3:ralt_switch = +level3(ralt_switch)
+ lv3:lalt_switch = +level3(lalt_switch)
+--- xkeyboard-config-0.8.orig/rules/base.xml.in
++++ xkeyboard-config-0.8/rules/base.xml.in
+@@ -2604,6 +2604,12 @@
+ <_description>Right Ctrl key changes group.</_description>
+ </configItem>
+ </option>
++ <option>
++ <configItem>
++ <name>grp:sclk_toggle</name>
++ <_description>ScrollLock key changes group.</_description>
++ </configItem>
++ </option>
+ </group>
+ <group allowMultipleSelection="true">
+ <!-- The key combination used to choose the 3rd (and 4th, together with Shift)
Added: trunk/data/xkb-data/debian/patches/series
===================================================================
--- trunk/data/xkb-data/debian/patches/series 2006-07-02 17:26:50 UTC (rev 2402)
+++ trunk/data/xkb-data/debian/patches/series 2006-07-02 20:30:59 UTC (rev 2403)
@@ -0,0 +1,3 @@
+docs.diff
+fr.po.diff
+sclk_toggle.diff
Modified: trunk/data/xkb-data/debian/rules
===================================================================
--- trunk/data/xkb-data/debian/rules 2006-07-02 17:26:50 UTC (rev 2402)
+++ trunk/data/xkb-data/debian/rules 2006-07-02 20:30:59 UTC (rev 2403)
@@ -13,31 +13,67 @@
confflags += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
endif
-xkb_base = /usr/share/X11/xkb
+xkb_base := /usr/share/X11/xkb
+stamp := stamp-dir/
+QUILT := quilt --quiltrc debian/patches/quiltrc
-config.status: configure
+$(stamp):
+ mkdir $@
+
+patch: $(stamp)patch
+$(stamp)patch: $(stamp)
+ @if $(QUILT) next >/dev/null 2>&1; then \
+ echo -n "Applying patches..."; \
+ if $(QUILT) push -a -v > ${stamp}patch-log 2>&1; then \
+ echo "successful."; \
+ mv ${stamp}patch-log $@; \
+ else \
+ echo "failed! (check ${stamp}patch-log for details)"; \
+ exit 1; \
+ fi; \
+ else \
+ echo "No patches to apply"; \
+ fi
+
+unpatch:
+ @echo -n "Unapplying patches..."
+ @if $(QUILT) top >/dev/null 2>&1; then \
+ if $(QUILT) pop -a -v > $(stamp)unpatch-log 2>&1; then \
+ echo "successful."; \
+ else \
+ echo "failed! (check $(stamp)unpatch-log for details)"; \
+ exit 1; \
+ fi; \
+ else \
+ echo "nothing to do."; \
+ fi
+ -rm -f $(stamp)patch $(stamp)patch-log $(stamp)unpatch-log
+ -rm -rf .pc
+
+config.status: $(stamp)configure
+$(stamp)configure: $(stamp)patch
dh_testdir
./configure $(confflags) \
--prefix=/usr \
--disable-xkbcomp-symlink --with-xkb-rules-symlink=xfree86,xorg \
--with-xkb-base=$(xkb_base) \
XKBCOMP=/no/thanks
+ touch $@
-build: build-stamp
-
-build-stamp: config.status
+build: $(stamp)build
+$(stamp)build: $(stamp)configure
dh_testdir
# Files kept so that xkbcomp is not needed
for d in compat geometry keycodes keymap semantics symbols types; \
do cp debian/$$d.dir $$d/; done
$(MAKE)
- touch build-stamp
+ touch $@
-clean:
+clean: unpatch
dh_testdir
dh_testroot
- rm -f build-stamp
+ rm -rf $(stamp)
-$(MAKE) distclean
# Files not cleaned up
@@ -47,7 +83,7 @@
dh_clean
deb:
- dpkg-buildpackage -rfakeroot -i'/\.git'
+ dpkg-buildpackage -rfakeroot -i'/\.git|/\.svn'
install: build
dh_testdir
Modified: trunk/data/xkb-data/docs/README.config
===================================================================
--- trunk/data/xkb-data/docs/README.config 2006-07-02 17:26:50 UTC (rev 2402)
+++ trunk/data/xkb-data/docs/README.config 2006-07-02 20:30:59 UTC (rev 2403)
@@ -41,7 +41,7 @@
The proper rules file depends on your vendor. In reality, the commonest file
of rules is xfree86. For each rules file there is a description file named
<vendor-rules>.lst, for instance xfree86.lst which is located in xkb configu-
-ration subdirectory rules (for example /usr/share/X11/xkb/rules).
+ration subdirectory rules (for example /etc/X11/xkb/rules).
2.1 Basic Configuration
Modified: trunk/data/xkb-data/po/fr.po
===================================================================
--- trunk/data/xkb-data/po/fr.po 2006-07-02 17:26:50 UTC (rev 2402)
+++ trunk/data/xkb-data/po/fr.po 2006-07-02 20:30:59 UTC (rev 2403)
@@ -6,10 +6,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: xkeyboard-config 0.8\n"
+"Project-Id-Version: xkeyboard-config 0.6\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2006-03-04 17:41+0000\n"
-"PO-Revision-Date: 2006-03-08 22:28+0100\n"
+"PO-Revision-Date: 2005-10-10 23:35+0200\n"
"Last-Translator: Denis Barbier <barbier@linuxfr.org>\n"
"Language-Team: French <traduc@traduc.org>\n"
"MIME-Version: 1.0\n"
@@ -131,15 +131,16 @@
#: ../rules/base.xml.in.h:29
msgid "Afg"
-msgstr "Afg"
+msgstr ""
#: ../rules/base.xml.in.h:30
+#, fuzzy
msgid "Afghanistan"
-msgstr "Afghanistan"
+msgstr "Pakistan"
#: ../rules/base.xml.in.h:31
msgid "Akan"
-msgstr "Akan"
+msgstr ""
#: ../rules/base.xml.in.h:32
msgid "Alb"
@@ -158,6 +159,7 @@
msgstr "Alt est obtenu avec la touche Logo de droite, et Super avec Menu."
#: ../rules/base.xml.in.h:36
+#, fuzzy
msgid "Alt+Ctrl changes group."
msgstr "Alt+Ctrl change de groupe."
@@ -190,12 +192,13 @@
msgstr "Autre, sans touches mortes"
#: ../rules/base.xml.in.h:44
+#, fuzzy
msgid "And"
-msgstr "And"
+msgstr "Ind"
#: ../rules/base.xml.in.h:45
msgid "Andorra"
-msgstr "Andorre"
+msgstr ""
#: ../rules/base.xml.in.h:46
msgid "Apostrophe (') variant"
@@ -343,7 +346,7 @@
#: ../rules/base.xml.in.h:82
msgid "Cambodia"
-msgstr "Cambodge"
+msgstr ""
#: ../rules/base.xml.in.h:83
msgid "Can"
@@ -354,8 +357,9 @@
msgstr "Canada"
#: ../rules/base.xml.in.h:85
+#, fuzzy
msgid "Caps Lock is Compose."
-msgstr "Verr. maj. est Compose."
+msgstr "Menu est Compose."
#: ../rules/base.xml.in.h:86
msgid "CapsLock LED shows alternative group."
@@ -402,7 +406,7 @@
#: ../rules/base.xml.in.h:96
msgid "Catalan variant with middle-dot L"
-msgstr "Catalan avec L point médian"
+msgstr ""
#: ../rules/base.xml.in.h:97
msgid "Che"
@@ -417,8 +421,9 @@
msgstr "Cherry Blue Line CyBo@rd (autre option)"
#: ../rules/base.xml.in.h:100
+#, fuzzy
msgid "Cherry CyBo@rd USB-Hub"
-msgstr "Cherry CyBo@rd USB-Hub"
+msgstr "Cherry Blue Line CyBo@rd"
#: ../rules/base.xml.in.h:101
msgid "Cherry CyMotion Master Linux"
@@ -465,18 +470,22 @@
msgstr "Croatie"
#: ../rules/base.xml.in.h:112
+#, fuzzy
msgid "Ctrl key at bottom left"
msgstr "Touche Ctrl en bas à gauche"
#: ../rules/base.xml.in.h:113
+#, fuzzy
msgid "Ctrl key at left of 'A'"
msgstr "Touche Ctrl à la gauche du « A »"
#: ../rules/base.xml.in.h:114
+#, fuzzy
msgid "Ctrl key position"
msgstr "Position de la touche Contrôle"
#: ../rules/base.xml.in.h:115
+#, fuzzy
msgid "Ctrl+Shift changes group."
msgstr "Ctrl+Maj. change de groupe."
@@ -513,8 +522,9 @@
msgstr "Dell PC 101 touches"
#: ../rules/base.xml.in.h:124
+#, fuzzy
msgid "Dell USB Multimedia Keybard"
-msgstr "Dell USB Multimedia"
+msgstr "Multimedia Super Power"
#: ../rules/base.xml.in.h:125
msgid "Denmark"
@@ -557,8 +567,9 @@
msgstr "Ennyah DKB-1008"
#: ../rules/base.xml.in.h:135
+#, fuzzy
msgid "Epo"
-msgstr "Epo"
+msgstr "Esp"
#: ../rules/base.xml.in.h:136
msgid "Esp"
@@ -566,7 +577,7 @@
#: ../rules/base.xml.in.h:137
msgid "Esperanto"
-msgstr "Esperanto"
+msgstr ""
#: ../rules/base.xml.in.h:138
msgid "Est"
@@ -581,8 +592,9 @@
msgstr "Everex STEPnote"
#: ../rules/base.xml.in.h:141
+#, fuzzy
msgid "Ewe"
-msgstr "Ewe"
+msgstr "Sué"
#: ../rules/base.xml.in.h:142
msgid "Extended"
@@ -642,7 +654,7 @@
#: ../rules/base.xml.in.h:156
msgid "Fula"
-msgstr "Peul"
+msgstr ""
#: ../rules/base.xml.in.h:157
msgid "GBr"
@@ -650,7 +662,7 @@
#: ../rules/base.xml.in.h:158
msgid "Ga"
-msgstr "Ga"
+msgstr ""
#: ../rules/base.xml.in.h:159
msgid "Generic 101-key PC"
@@ -669,8 +681,9 @@
msgstr "PC générique 105 touches (intl)"
#: ../rules/base.xml.in.h:163
+#, fuzzy
msgid "Genius Comfy KB-12e"
-msgstr "Genius Comfy KB-12e"
+msgstr "Genius Comfy KB-21e-Scroll"
#: ../rules/base.xml.in.h:164
msgid "Genius Comfy KB-16M / Genius MM Keyboard KWD-910"
@@ -701,12 +714,13 @@
msgstr "Allemagne"
#: ../rules/base.xml.in.h:171
+#, fuzzy
msgid "Gha"
-msgstr "Gha"
+msgstr "Tha"
#: ../rules/base.xml.in.h:172
msgid "Ghana"
-msgstr "Ghana"
+msgstr ""
#: ../rules/base.xml.in.h:173
msgid "Gre"
@@ -734,7 +748,7 @@
#: ../rules/base.xml.in.h:179
msgid "Hausa"
-msgstr "Haoussa"
+msgstr ""
#: ../rules/base.xml.in.h:180
msgid "Hewlett-Packard Internet Keyboard"
@@ -890,19 +904,20 @@
#: ../rules/base.xml.in.h:218
msgid "Kaz"
-msgstr "Kaz"
+msgstr ""
#: ../rules/base.xml.in.h:219
msgid "Kazakh with Russian"
-msgstr "Kazakh avec russe"
+msgstr ""
#: ../rules/base.xml.in.h:220
+#, fuzzy
msgid "Kazakhstan"
-msgstr "Kazakhstan"
+msgstr "Pakistan"
#: ../rules/base.xml.in.h:221
msgid "Keypad"
-msgstr "Pavé numérique"
+msgstr ""
#: ../rules/base.xml.in.h:222
msgid "Keytronic FlexPro"
@@ -910,7 +925,7 @@
#: ../rules/base.xml.in.h:223
msgid "Khm"
-msgstr "Khm"
+msgstr ""
#: ../rules/base.xml.in.h:224
msgid "Kyr"
@@ -941,12 +956,14 @@
msgstr "Compaq portable Internet (p.e. Presario)"
#: ../rules/base.xml.in.h:231
+#, fuzzy
msgid "Laptop/notebook Dell Inspiron 6xxx/8xxx"
-msgstr "Dell Inspiron 6xxx/8xxx"
+msgstr "Dell Inspiron 8xxx"
#: ../rules/base.xml.in.h:232
+#, fuzzy
msgid "Laptop/notebook eMachines m68xx"
-msgstr "eMachines m68xx"
+msgstr "Dell Inspiron 8xxx"
#: ../rules/base.xml.in.h:233
msgid "Latin"
@@ -1002,7 +1019,7 @@
#: ../rules/base.xml.in.h:246
msgid "Left handed Dvorak"
-msgstr "Dvorak pour gaucher"
+msgstr ""
#: ../rules/base.xml.in.h:247
msgid "Lithuania"
@@ -1081,8 +1098,9 @@
msgstr "Lva"
#: ../rules/base.xml.in.h:266
+#, fuzzy
msgid "Macedonia"
-msgstr "Macédoine"
+msgstr "Macédonien"
#: ../rules/base.xml.in.h:267
msgid "Macintosh"
@@ -1093,12 +1111,14 @@
msgstr "Macintosh ancien"
#: ../rules/base.xml.in.h:269
+#, fuzzy
msgid "Make CapsLock an additional Ctrl."
msgstr "Faire de la touche Verr. maj. une touche Ctrl supplémentaire."
#: ../rules/base.xml.in.h:270
+#, fuzzy
msgid "Mal"
-msgstr "Mal"
+msgstr "Malte"
#: ../rules/base.xml.in.h:271
msgid "Malayalam"
@@ -1106,7 +1126,7 @@
#: ../rules/base.xml.in.h:272
msgid "Maldives"
-msgstr "Maldives"
+msgstr ""
#: ../rules/base.xml.in.h:273
msgid "Malta"
@@ -1209,8 +1229,9 @@
msgstr "Multilingue"
#: ../rules/base.xml.in.h:298
+#, fuzzy
msgid "Multilingual, first part"
-msgstr "Multilingue, partie 1"
+msgstr "Multilingue, partie 2"
#: ../rules/base.xml.in.h:299
msgid "Multilingual, second part"
@@ -1282,7 +1303,7 @@
#: ../rules/base.xml.in.h:316
msgid "Pashto"
-msgstr "Pashto"
+msgstr ""
#: ../rules/base.xml.in.h:317
msgid "Pattachote"
@@ -1310,7 +1331,7 @@
#: ../rules/base.xml.in.h:323
msgid "Power G5"
-msgstr "Power G5"
+msgstr ""
#: ../rules/base.xml.in.h:324
msgid "PowerPC PS/2"
@@ -1333,6 +1354,7 @@
msgstr "La touche Alt de droite (AltGr) sélectionne le 3e niveau."
#: ../rules/base.xml.in.h:329
+#, fuzzy
msgid "Press Right Ctrl to choose 3rd level."
msgstr "La touche Ctrl de droite sélectionne le 3e niveau."
@@ -1349,12 +1371,13 @@
msgstr "N'importe quelle touche Logo sélectionne le 3e niveau."
#: ../rules/base.xml.in.h:333
+#, fuzzy
msgid "Pro"
-msgstr "Pro"
+msgstr "Pol"
#: ../rules/base.xml.in.h:334
msgid "Pro Keypad"
-msgstr "Pavé Pro"
+msgstr ""
#: ../rules/base.xml.in.h:335
msgid "Probhat"
@@ -1397,6 +1420,7 @@
msgstr "Maintenir la touche Ctrl de droite enfoncée change de groupe."
#: ../rules/base.xml.in.h:345
+#, fuzzy
msgid "Right Ctrl key works as Right Alt."
msgstr "La touche Ctrl de droite se comporte comme la touche Alt de droite."
@@ -1418,7 +1442,7 @@
#: ../rules/base.xml.in.h:350
msgid "Right handed Dvorak"
-msgstr "Dvorak pour droitier"
+msgstr ""
#: ../rules/base.xml.in.h:351
msgid "Romania"
@@ -1458,15 +1482,15 @@
#: ../rules/base.xml.in.h:360
msgid "Russian with Kazakh"
-msgstr "Russe avec kazakh"
+msgstr ""
#: ../rules/base.xml.in.h:361
msgid "SCG"
-msgstr "SCG"
+msgstr ""
#: ../rules/base.xml.in.h:362
msgid "SILVERCREST Multimedia Wireless Keyboard"
-msgstr "SILVERCREST Multimedia Wireless Keyboard"
+msgstr ""
#: ../rules/base.xml.in.h:363
msgid "SK-1300"
@@ -1502,7 +1526,7 @@
#: ../rules/base.xml.in.h:371
msgid "Serbia and Montenegro"
-msgstr "Serbie-et-Monténégro"
+msgstr ""
#: ../rules/base.xml.in.h:372
msgid "Shift with numpad keys works as in MS Windows."
@@ -1523,11 +1547,11 @@
#: ../rules/base.xml.in.h:376
msgid "South Africa"
-msgstr "Afrique du Sud"
+msgstr ""
#: ../rules/base.xml.in.h:377
msgid "Southern Uzbek"
-msgstr "Ouzbek du Sud"
+msgstr ""
#: ../rules/base.xml.in.h:378
msgid "Spain"
@@ -1582,6 +1606,7 @@
msgstr "Svn"
#: ../rules/base.xml.in.h:392
+#, fuzzy
msgid "Swap Ctrl and CapsLock."
msgstr "Interchanger Ctrl et Verr. maj."
@@ -1643,7 +1668,7 @@
#: ../rules/base.xml.in.h:407
msgid "Tatar"
-msgstr "Tatar"
+msgstr ""
#: ../rules/base.xml.in.h:408
msgid "Telugu"
@@ -1686,8 +1711,9 @@
msgstr "Tur"
#: ../rules/base.xml.in.h:418
+#, fuzzy
msgid "Turkey"
-msgstr "Turquie"
+msgstr "Tur"
#: ../rules/base.xml.in.h:419
msgid "Typewriter"
@@ -1698,16 +1724,19 @@
msgstr "Anglais U.S."
#: ../rules/base.xml.in.h:421
+#, fuzzy
msgid "US keyboard with Bosnian digraphs"
-msgstr "Clavier US avec digraphes bosniaques"
+msgstr "Clavier US avec lettres roumaines"
#: ../rules/base.xml.in.h:422
+#, fuzzy
msgid "US keyboard with Bosnian letters"
-msgstr "Clavier US avec lettres bosniaques"
+msgstr "Clavier US avec lettres roumaines"
#: ../rules/base.xml.in.h:423
+#, fuzzy
msgid "US keyboard with Croatian digraphs"
-msgstr "Clavier US avec digraphes croates"
+msgstr "Clavier US avec lettres croates"
#: ../rules/base.xml.in.h:424
msgid "US keyboard with Croatian letters"
@@ -1722,12 +1751,14 @@
msgstr "Clavier US avec lettres maltaises"
#: ../rules/base.xml.in.h:427
+#, fuzzy
msgid "US keyboard with Slovenian digraphs"
-msgstr "Clavier US avec digraphes slovènes"
+msgstr "Clavier US avec lettres roumaines"
#: ../rules/base.xml.in.h:428
+#, fuzzy
msgid "US keyboard with Slovenian letters"
-msgstr "Clavier US avec lettres slovènes"
+msgstr "Clavier US avec lettres roumaines"
#: ../rules/base.xml.in.h:429
msgid "USA"
@@ -1755,19 +1786,19 @@
#: ../rules/base.xml.in.h:435
msgid "Use Bosnian digraphs"
-msgstr "Avec digraphes bosniaques"
+msgstr ""
#: ../rules/base.xml.in.h:436
msgid "Use Croatian digraphs"
-msgstr "Avec digraphes croates"
+msgstr ""
#: ../rules/base.xml.in.h:437
msgid "Use Slovenian digraphs"
-msgstr "Avec digraphes slovènes"
+msgstr ""
#: ../rules/base.xml.in.h:438
msgid "Use guillemots for quotes"
-msgstr "Avec guillemets français"
+msgstr ""
#: ../rules/base.xml.in.h:439
msgid "Use keyboard LED to show alternative group."
@@ -1816,7 +1847,7 @@
#: ../rules/base.xml.in.h:450
msgid "Zar"
-msgstr "Zar"
+msgstr ""
#: ../rules/base.xml.in.h:451
msgid "azerty"
@@ -1853,3 +1884,24 @@
#: ../rules/base.xml.in.h:459
msgid "si1452"
msgstr "si1452"
+
+#~ msgid "Turkish"
+#~ msgstr "Turque"
+
+#~ msgid "\"Standard\""
+#~ msgstr "Standard"
+
+#~ msgid "Dhivehi"
+#~ msgstr "Maldivien"
+
+#~ msgid "Div"
+#~ msgstr "Div"
+
+#~ msgid "Serbian"
+#~ msgstr "Serbe"
+
+#~ msgid "Srp"
+#~ msgstr "Srp"
+
+#~ msgid "Tamil INSCRIPT"
+#~ msgstr "Tamoul INSCRIPT"
Modified: trunk/data/xkb-data/rules/base
===================================================================
--- trunk/data/xkb-data/rules/base 2006-07-02 17:26:50 UTC (rev 2402)
+++ trunk/data/xkb-data/rules/base 2006-07-02 20:30:59 UTC (rev 2403)
@@ -970,7 +970,6 @@
grp:lctrl_toggle = +group(lctrl_toggle)
grp:rctrl_toggle = +group(rctrl_toggle)
grp:lalt_toggle = +group(lalt_toggle)
- grp:sclk_toggle = +group(sclk_toggle)
lv3:switch = +level3(switch)
lv3:ralt_switch = +level3(ralt_switch)
lv3:lalt_switch = +level3(lalt_switch)
Modified: trunk/data/xkb-data/rules/base.o_s.part
===================================================================
--- trunk/data/xkb-data/rules/base.o_s.part 2006-07-02 17:26:50 UTC (rev 2402)
+++ trunk/data/xkb-data/rules/base.o_s.part 2006-07-02 20:30:59 UTC (rev 2403)
@@ -20,7 +20,6 @@
grp:lctrl_toggle = +group(lctrl_toggle)
grp:rctrl_toggle = +group(rctrl_toggle)
grp:lalt_toggle = +group(lalt_toggle)
- grp:sclk_toggle = +group(sclk_toggle)
lv3:switch = +level3(switch)
lv3:ralt_switch = +level3(ralt_switch)
lv3:lalt_switch = +level3(lalt_switch)
Modified: trunk/data/xkb-data/rules/base.xml.in
===================================================================
--- trunk/data/xkb-data/rules/base.xml.in 2006-07-02 17:26:50 UTC (rev 2402)
+++ trunk/data/xkb-data/rules/base.xml.in 2006-07-02 20:30:59 UTC (rev 2403)
@@ -2604,12 +2604,6 @@
<_description>Right Ctrl key changes group.</_description>
</configItem>
</option>
- <option>
- <configItem>
- <name>grp:sclk_toggle</name>
- <_description>ScrollLock key changes group.</_description>
- </configItem>
- </option>
</group>
<group allowMultipleSelection="true">
<!-- The key combination used to choose the 3rd (and 4th, together with Shift)
Modified: trunk/data/xkb-data/symbols/group
===================================================================
--- trunk/data/xkb-data/symbols/group 2006-07-02 17:26:50 UTC (rev 2402)
+++ trunk/data/xkb-data/symbols/group 2006-07-02 20:30:59 UTC (rev 2403)
@@ -293,16 +293,3 @@
virtualMods= AltGr
};
};
-
-
-// using the group(sclk_toggle) map, pressing the Scroll Lock key
-// toggles groups.
-partial modifier_keys
-xkb_symbols "sclk_toggle" {
- virtual_modifiers AltGr;
- key <SCLK> {
- virtualMods= AltGr,
- symbols[Group1] = [ ISO_Next_Group ]
- };
-};
-
Reply to: