Author: dnusinow Date: 2006-07-02 20:49:09 -0400 (Sun, 02 Jul 2006) New Revision: 2408
Added: branches/7.1/data/xkb-data/debian/patches/ Modified: branches/7.1/data/xkb-data/debian/changelog branches/7.1/data/xkb-data/debian/control branches/7.1/data/xkb-data/debian/rules branches/7.1/data/xkb-data/docs/README.config branches/7.1/data/xkb-data/po/fr.po branches/7.1/data/xkb-data/rules/base branches/7.1/data/xkb-data/rules/base.o_s.part branches/7.1/data/xkb-data/rules/base.xml.in branches/7.1/data/xkb-data/symbols/group branches/7.1/debian/xorg/debian/changelog branches/7.1/debian/xorg/debian/po/ru.po Log: Merge the latest from trunk to version 2047 Modified: branches/7.1/data/xkb-data/debian/changelog =================================================================== --- branches/7.1/data/xkb-data/debian/changelog 2006-07-02 22:48:44 UTC (rev 2407) +++ branches/7.1/data/xkb-data/debian/changelog 2006-07-03 00:49:09 UTC (rev 2408) @@ -4,8 +4,20 @@ * debian/control: Bump Standards-Version to 3.7.2, no changes needed. - -- Denis Barbier <[EMAIL PROTECTED]> Fri, 16 Jun 2006 11:49:31 +0200 + * debian/control: Use quilt to manage changes. + * Sync with CVS 2006-07-02. + The following bugs have been fixed upstream: + + XF86AudioRaiseVolume is defined twice for Logitech keyboards. + Closes: #363925 + + hr(us) layout apparently broken. Closes: #373833 + + symbols/inet and rules/base.* do not match. Closes: #368885 + + no korean alphabet (hangul) mapping support. Closes: #342615 + + * Drop fr.po.diff, included upstream. + + -- Denis Barbier <[EMAIL PROTECTED]> 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: branches/7.1/data/xkb-data/debian/control =================================================================== --- branches/7.1/data/xkb-data/debian/control 2006-07-02 22:48:44 UTC (rev 2407) +++ branches/7.1/data/xkb-data/debian/control 2006-07-03 00:49:09 UTC (rev 2408) @@ -3,7 +3,7 @@ Priority: extra Maintainer: Debian X Strike Force <[email protected]> Uploaders: Denis Barbier <[EMAIL PROTECTED]> -Build-Depends: debhelper (>= 4.0.0) +Build-Depends: debhelper (>= 4.0.0), quilt Build-Depends-Indep: libxml-parser-perl Standards-Version: 3.7.2 Copied: branches/7.1/data/xkb-data/debian/patches (from rev 2407, trunk/data/xkb-data/debian/patches) Modified: branches/7.1/data/xkb-data/debian/rules =================================================================== --- branches/7.1/data/xkb-data/debian/rules 2006-07-02 22:48:44 UTC (rev 2407) +++ branches/7.1/data/xkb-data/debian/rules 2006-07-03 00:49:09 UTC (rev 2408) @@ -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: $(stamp) 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: branches/7.1/data/xkb-data/docs/README.config =================================================================== --- branches/7.1/data/xkb-data/docs/README.config 2006-07-02 22:48:44 UTC (rev 2407) +++ branches/7.1/data/xkb-data/docs/README.config 2006-07-03 00:49:09 UTC (rev 2408) @@ -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: branches/7.1/data/xkb-data/po/fr.po =================================================================== --- branches/7.1/data/xkb-data/po/fr.po 2006-07-02 22:48:44 UTC (rev 2407) +++ branches/7.1/data/xkb-data/po/fr.po 2006-07-03 00:49:09 UTC (rev 2408) @@ -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 <[EMAIL PROTECTED]>\n" "Language-Team: French <[EMAIL PROTECTED]>\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 [EMAIL PROTECTED] (autre option)" #: ../rules/base.xml.in.h:100 +#, fuzzy msgid "Cherry [EMAIL PROTECTED] USB-Hub" -msgstr "Cherry [EMAIL PROTECTED] USB-Hub" +msgstr "Cherry Blue Line [EMAIL PROTECTED]" #: ../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: branches/7.1/data/xkb-data/rules/base =================================================================== --- branches/7.1/data/xkb-data/rules/base 2006-07-02 22:48:44 UTC (rev 2407) +++ branches/7.1/data/xkb-data/rules/base 2006-07-03 00:49:09 UTC (rev 2408) @@ -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: branches/7.1/data/xkb-data/rules/base.o_s.part =================================================================== --- branches/7.1/data/xkb-data/rules/base.o_s.part 2006-07-02 22:48:44 UTC (rev 2407) +++ branches/7.1/data/xkb-data/rules/base.o_s.part 2006-07-03 00:49:09 UTC (rev 2408) @@ -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: branches/7.1/data/xkb-data/rules/base.xml.in =================================================================== --- branches/7.1/data/xkb-data/rules/base.xml.in 2006-07-02 22:48:44 UTC (rev 2407) +++ branches/7.1/data/xkb-data/rules/base.xml.in 2006-07-03 00:49:09 UTC (rev 2408) @@ -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: branches/7.1/data/xkb-data/symbols/group =================================================================== --- branches/7.1/data/xkb-data/symbols/group 2006-07-02 22:48:44 UTC (rev 2407) +++ branches/7.1/data/xkb-data/symbols/group 2006-07-03 00:49:09 UTC (rev 2408) @@ -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 ] - }; -}; - Modified: branches/7.1/debian/xorg/debian/changelog =================================================================== --- branches/7.1/debian/xorg/debian/changelog 2006-07-02 22:48:44 UTC (rev 2407) +++ branches/7.1/debian/xorg/debian/changelog 2006-07-03 00:49:09 UTC (rev 2408) @@ -14,6 +14,7 @@ - Romanian (Eddy Petrisor). Closes: #374082 - Vietnamese (Clytie Siddall). Closes: #375087 - Swedish (Daniel Nylander). Closes: #375970 + - Russian (Yuri Kozlov). Closes: #376343 * New debconf translations: - Nepali (Mahesh subedi). Closes: #374803 - Khmer (auk piseth). Closes: #375063 Modified: branches/7.1/debian/xorg/debian/po/ru.po =================================================================== --- branches/7.1/debian/xorg/debian/po/ru.po 2006-07-02 22:48:44 UTC (rev 2407) +++ branches/7.1/debian/xorg/debian/po/ru.po 2006-07-03 00:49:09 UTC (rev 2408) @@ -30,7 +30,7 @@ "Project-Id-Version: xserver-xorg_debian_po_ru\n" "Report-Msgid-Bugs-To: [EMAIL PROTECTED]" "POT-Creation-Date: 2006-06-14 21:41+0200\n" -"PO-Revision-Date: 2006-05-19 22:12+0300\n" +"PO-Revision-Date: 2006-07-02 12:31+0300\n" "Last-Translator: Yuri Kozlov <[EMAIL PROTECTED]>\n" "Language-Team: Russian <[email protected]>\n" "MIME-Version: 1.0\n" @@ -147,7 +147,7 @@ #. Description #: ../x11-common.templates:50 msgid "Cannot remove /usr/X11R6/bin directory" -msgstr "" +msgstr "Не удалось удалить каталог /usr/X11R6/bin" #. Type: note #. Description @@ -159,6 +159,12 @@ "are currently in the directory out of the way so that the installation can " "complete. If you like, you may move them back after the symlink is in place." msgstr "" +"Для данного обновления требуется удаление каталога /usr/X11R6/bin " +"и замена на символическую ссылку. Попытка сделать это не удалась, скорее " +"всего из-за того, что этот каталог всё ещё не пустой. Вы должны переместить " +"файлы из этого каталога для завершения установки. Если нужно, вы " +"можете переместить их обратно, после того как будет создана символическая " +"ссылка." #. Type: note #. Description @@ -168,6 +174,8 @@ "Please re-run your upgrade procedure after you have cleaned out the " "directory." msgstr "" +"Пока установка считается неудачной и прерывается, чтобы вы могли сделать это. " +"После очистки каталога запустите процедуру обновления ещё раз." #. Type: boolean #. Description @@ -788,8 +796,7 @@ #. Type: string #. Description #: ../xserver-xorg.templates:235 -msgid "" -"Users of U.S. English keyboards should generally leave this entry blank." +msgid "Users of U.S. English keyboards should generally leave this entry blank." msgstr "" "Пользователям американских клавиатур (США) обычно следует оставить это поле " "пустым." @@ -1023,10 +1030,8 @@ #. Type: boolean #. Description #: ../xserver-xorg.templates:334 -msgid "" -"If autodetection fails, you will be asked for information about the monitor." -msgstr "" -"Если автоопределение не сработает, вам будут заданы вопросы о вашем мониторе." +msgid "If autodetection fails, you will be asked for information about the monitor." +msgstr "Если автоопределение не сработает, вам будут заданы вопросы о вашем мониторе." #. Type: select #. Description @@ -1336,3 +1341,4 @@ msgstr "" "Ответьте положительно, если хотите повторно определить раскладку клавиатуры. " "Ответьте отрицательно, если хотите сохранить имеющуюся раскладку." + -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
