.gitignore | 1 ChangeLog | 347 ++ NEWS | 4 configure.in | 4 debian/changelog | 10 debian/control | 1 keycodes/xfree86 | 5 po/bg.po | 3957 ++++++++++++++++++++------------- po/ca.po | 2698 +++++++++++----------- po/cs.po | 4457 ++++++++++++++++++++++++------------- po/da.po | 2440 ++++++++++---------- po/de.po | 2529 +++++++++++---------- po/eo.po | 4487 +++++++++++++++++++++++-------------- po/fr.po | 4326 ++++++++++++++---------------------- po/hu.po | 3748 ++++++++++++++++++------------- po/it.po | 2724 ++++++++++++---------- po/ja.po | 3808 ++++++++++++++++++++++++++++++++ po/ko.po | 2425 ++++++++++---------- po/nl.po | 4619 +++++++++++++++++++++++---------------- po/pl.po | 2408 ++++++++++---------- po/ru.po | 2623 +++++++++++----------- po/sv.po | 42 po/uk.po | 2578 +++++++++++---------- po/xkeyboard-config.pot | 1972 ++++++++-------- rules/base.extras.xml.in | 184 + rules/base.xml.in | 451 ++- rules/compat/variantsMapping.lst | 1 symbols/Makefile.am | 4 symbols/ad | 2 symbols/af | 13 symbols/al | 2 symbols/am | 22 symbols/apl | 2 symbols/ara | 12 symbols/at | 8 symbols/az | 4 symbols/ba | 10 symbols/bd | 5 symbols/be | 16 symbols/bg | 6 symbols/br | 16 symbols/brai | 4 symbols/bt | 2 symbols/bw | 2 symbols/by | 6 symbols/ca | 77 symbols/cd | 2 symbols/ch | 18 symbols/cm | 331 ++ symbols/cn | 8 symbols/cz | 12 symbols/de | 32 symbols/dk | 10 symbols/ee | 8 symbols/epo | 2 symbols/es | 20 symbols/et | 4 symbols/fi | 10 symbols/fo | 4 symbols/fr | 38 symbols/gb | 18 symbols/ge | 10 symbols/gh | 18 symbols/gn | 2 symbols/gr | 10 symbols/hr | 10 symbols/hu | 42 symbols/ie | 10 symbols/il | 8 symbols/in | 46 symbols/inet | 4 symbols/iq | 10 symbols/ir | 16 symbols/is | 10 symbols/it | 12 symbols/jp | 10 symbols/ke | 4 symbols/kg | 4 symbols/kh | 2 symbols/kr | 4 symbols/kz | 8 symbols/la | 4 symbols/latam | 8 symbols/latin | 81 symbols/lk | 6 symbols/lt | 52 symbols/lv | 526 +++- symbols/ma | 16 symbols/me | 16 symbols/mk | 4 symbols/ml | 8 symbols/mm | 2 symbols/mn | 2 symbols/mt | 4 symbols/mv | 2 symbols/ng | 8 symbols/nl | 8 symbols/no | 14 symbols/nokia_vndr/rx-51 | 897 +++++++ symbols/np | 2 symbols/ph | 20 symbols/pk | 12 symbols/pl | 66 symbols/pt | 18 symbols/ro | 58 symbols/rs | 20 symbols/ru | 105 symbols/se | 75 symbols/si | 6 symbols/sk | 8 symbols/sn | 2 symbols/sy | 12 symbols/th | 8 symbols/tj | 4 symbols/tm | 4 symbols/tr | 38 symbols/tw | 6 symbols/tz | 2 symbols/ua | 38 symbols/us | 48 symbols/uz | 26 symbols/vn | 2 symbols/za | 2 tests/genLists4Comparizon.sh | 12 124 files changed, 33414 insertions(+), 22657 deletions(-)
New commits: commit bc78f0d42f88c19c492ab4fb8263e52ba12bcdd3 Author: Cyril Brulebois <k...@debian.org> Date: Sat Jun 4 00:35:21 2011 +0200 Upload to experimental. diff --git a/debian/changelog b/debian/changelog index 0f3dc4a..1f70076 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -xkeyboard-config (2.3-1) UNRELEASED; urgency=low +xkeyboard-config (2.3-1) experimental; urgency=low * New upstream release: - Since 2.1 is still supposed to be the best for GNOME2, and since @@ -6,7 +6,7 @@ xkeyboard-config (2.3-1) UNRELEASED; urgency=low rather than unstable. * Add intltool build-dep. - -- Cyril Brulebois <k...@debian.org> Fri, 03 Jun 2011 23:56:14 +0200 + -- Cyril Brulebois <k...@debian.org> Sat, 04 Jun 2011 00:35:16 +0200 xkeyboard-config (2.2.1-1) experimental; urgency=low commit 70e8e2efe26f467869784d9451662c140bdf51b1 Author: Cyril Brulebois <k...@debian.org> Date: Sat Jun 4 00:35:08 2011 +0200 Add intltool build-dep. diff --git a/debian/changelog b/debian/changelog index f99ce81..0f3dc4a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ xkeyboard-config (2.3-1) UNRELEASED; urgency=low - Since 2.1 is still supposed to be the best for GNOME2, and since GNOME3 is still being prepared in experimental, target that suite rather than unstable. + * Add intltool build-dep. -- Cyril Brulebois <k...@debian.org> Fri, 03 Jun 2011 23:56:14 +0200 diff --git a/debian/control b/debian/control index 02c4683..8bd3b95 100644 --- a/debian/control +++ b/debian/control @@ -11,6 +11,7 @@ Build-Depends-Indep: libxml-parser-perl, x11-xkb-utils, libglib2.0-dev, + intltool, Standards-Version: 3.9.1 Vcs-Git: git://git.debian.org/git/pkg-xorg/data/xkb-data Vcs-Browser: http://git.debian.org/?p=pkg-xorg/data/xkb-data.git commit d03863dace73f9f059b5078913d9d0d47a9132b5 Author: Cyril Brulebois <k...@debian.org> Date: Sat Jun 4 00:00:21 2011 +0200 Explain the upload to experimental, thanks to Sergey. diff --git a/debian/changelog b/debian/changelog index 7af94ef..f99ce81 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,9 @@ xkeyboard-config (2.3-1) UNRELEASED; urgency=low - * New upstream release. + * New upstream release: + - Since 2.1 is still supposed to be the best for GNOME2, and since + GNOME3 is still being prepared in experimental, target that suite + rather than unstable. -- Cyril Brulebois <k...@debian.org> Fri, 03 Jun 2011 23:56:14 +0200 commit 4af2c5f9b3d80161e57f4a6aad3c588eb8906529 Author: Cyril Brulebois <k...@debian.org> Date: Fri Jun 3 23:56:30 2011 +0200 Bump changelogs. diff --git a/ChangeLog b/ChangeLog index a39b01d..c44a3b5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,24 +1,357 @@ -commit 579842f5eb2ffbc902bd332fca84878621640270 +commit 0012006e23556fcc565a6ce2d7d265c28d876bff Author: Sergey V. Udaltsov <s...@gnome.org> -Date: Tue Apr 5 23:43:24 2011 +0100 +Date: Tue May 31 20:15:03 2011 +0100 - Preparing 2.2.1 + Preparing 2.3 -commit 670e6967ab1c41d2fb0bed2d5b7092d5b2ed42a1 +commit 0631d0ab16a89f2da8fcbbd8d8b77a3b39bdd998 +Author: Sergey V. Udaltsov <s...@gnome.org> +Date: Tue May 31 20:12:23 2011 +0100 + + Added localisation 'ja' + +commit d9338c0018a05b50bab8d8b70ee0a61e74c32ac3 +Author: Sergey V. Udaltsov <s...@gnome.org> +Date: Tue May 31 20:11:28 2011 +0100 + + Updated translations from TP + + Including https://bugs.freedesktop.org/show_bug.cgi?id=37565 + +commit c89b61e2bf48fefd1b19ce55b4fd97428e61a415 +Author: Sergey V. Udaltsov <s...@gnome.org> +Date: Fri May 27 21:30:02 2011 +0100 + + Moved ro(crh_dobruja) to extras + + https://bugs.freedesktop.org/show_bug.cgi?id=23544 + +commit 88a087588973ef6bdbf358b5e37230168d4acbcd +Author: Stefan Dirsch <sndir...@suse.de> +Date: Tue May 24 16:54:28 2011 +0200 + + Move fake key MDSW to a different keycode value in xfree86 table. + + According to symbols/inet this keycode is used by two keyboard models: + logitech_g15 and apple. + Thus it should not be used for a fake keycode that gets assigned to a + virtual modifier. + + Signed-off-by: Egbert Eich <e...@freedesktop.org> + +commit e5eb6f50085f6f7f836d65a828a7ecea715c0c7c +Author: Sergey V. Udaltsov <s...@gnome.org> +Date: Wed May 18 22:25:05 2011 +0100 + + Small fix + + https://bugs.freedesktop.org/show_bug.cgi?id=37202 + +commit 5cb182660bfce115d1218747e3810088757e4fd9 +Author: Vasyĺ V. Vercynśkyj <fuc...@ukr.net> +Date: Tue May 17 09:19:05 2011 +0300 + + added ru(ruu) to extras + + https://bugs.freedesktop.org/show_bug.cgi?id=30658 + +commit 55ea2758d471148968a021af20c0136b03f28c92 +Author: Sergey V. Udaltsov <s...@gnome.org> +Date: Tue May 17 21:50:29 2011 +0100 + + Actually it is olpc-phonetic that had to be added + + https://bugs.freedesktop.org/show_bug.cgi?id=37272 + +commit 2e50b67355f3eb62a72702e5e7444c6d75f6547e +Author: Sergey V. Udaltsov <s...@gnome.org> +Date: Tue May 17 21:13:14 2011 +0100 + + changed the version + + ... and updated POT + +commit a445a4262864a480b8447e831962d735bd5b4992 +Author: Vasyĺ V. Vercynśkyj <fuc...@ukr.net> +Date: Tue May 17 09:19:05 2011 +0300 + + added ru(ruu) to extras + + https://bugs.freedesktop.org/show_bug.cgi?id=30658 + +commit 1ea786cdefbeb7a196a02a75375766a16aa17a42 +Author: Walter Bender <walter.ben...@gmail.com> +Date: Tue May 17 09:11:08 2011 -0400 + + adding olpc-phonetic variant to Armenian + +commit 2b17c788a5389d42e12b9264232a4255bfcd3e5b +Author: Walter Bender <walter.ben...@gmail.com> +Date: Mon May 16 17:16:01 2011 -0400 + + adding olpc-phonetic layout + +commit 8defa21bb7f6f5b571ddc6df2d54d305c0e5d6d8 +Author: Sergey V. Udaltsov <s...@gnome.org> +Date: Mon May 16 22:04:15 2011 +0100 + + Dropped unneeded lt(dvorak) + + https://bugs.freedesktop.org/show_bug.cgi?id=34935 + +commit c6481860b9d8f59d239184c14cfe0e825b1d5103 +Author: Sergey V. Udaltsov <s...@gnome.org> +Date: Mon May 16 22:02:57 2011 +0100 + + Added lt(us_dvorak) into extras + + https://bugs.freedesktop.org/show_bug.cgi?id=34935 + +commit 7e5a73ef9f4b11356ddeefc6185bafede053eb1d +Author: Sergey V. Udaltsov <s...@gnome.org> +Date: Mon May 16 21:37:41 2011 +0100 + + Fixed some short descriptions + +commit d5b9fbf1faf513c6c493f424066ff3a6b6d3033f +Author: Sergey V. Udaltsov <s...@gnome.org> +Date: Sun May 15 21:42:13 2011 +0100 + + Added Cameroon materials + + https://bugs.freedesktop.org/show_bug.cgi?id=37202 + +commit 03c2c0d2ca83f6f09c01295cb31413e1e3b2272f +Author: Sergey V. Udaltsov <s...@gnome.org> +Date: Sun May 15 21:41:38 2011 +0100 + + one more temp file to be ignored + +commit 3aa08ed3eca9503435fceec92ad48e100ad92a57 +Author: Marcin Woliński <wolin...@ipipan.waw.pl> +Date: Fri May 13 17:06:50 2011 +0200 + + Polish international with dead keys + + A Polish layout variant with a comprehensive set of quotes, dashes, and dead accents + See http://marcinwolinski.pl/keyboard/ for a description. + +commit 2eeac28860caae4d7ca319503dfb0ac0ed19778c +Author: Sergey V. Udaltsov <s...@gnome.org> +Date: Tue May 3 00:34:17 2011 +0100 + + Missing variants for nokia n900 + + https://bugs.freedesktop.org/show_bug.cgi?id=36739 + +commit 9b8a4477f7c719f50d7fec41aa45d2ee6c2782dc +Author: Sergey V. Udaltsov <s...@gnome.org> +Date: Tue May 3 00:28:10 2011 +0100 + + syncing descriptions for me unicode variants + + "Unicode" always starts in uppercase + +commit 52b7c05561d1d8b1e9b46c05aa1a0257b4d2ad24 +Author: Sergey V. Udaltsov <s...@gnome.org> +Date: Tue May 3 00:27:01 2011 +0100 + + added se(swl) + + https://bugs.freedesktop.org/show_bug.cgi?id=36369 + +commit a51a81db40a6012d27ff33c1497fa0c07e6d33d7 +Author: Sergey V. Udaltsov <s...@gnome.org> +Date: Fri Apr 29 08:07:01 2011 +0100 + + improved comments for lt(lekp) + + https://bugs.freedesktop.org/show_bug.cgi?id=14096 + +commit 9997298d6294c181a967b5c6e7dff358872cb8f7 +Author: Sergey V. Udaltsov <s...@gnome.org> +Date: Thu Apr 28 22:03:58 2011 +0100 + + Sorting out the licensing issue for lt(lekp) and lt(lekpa) + + https://bugs.freedesktop.org/show_bug.cgi?id=14096 + +commit 10a98989359b94c6d7dd787df80a3d5e12bc3d64 +Author: Sergey V. Udaltsov <s...@gnome.org> +Date: Wed Apr 27 22:50:08 2011 +0100 + + unicode -> Unicode in descriptions + + Spotted by Jorge González + +commit 72355c66e34becfd45208cd32983f098e243bec1 +Author: Sergey V. Udaltsov <s...@gnome.org> +Date: Wed Apr 27 22:11:55 2011 +0100 + + Removed licensing nonsense + + https://bugs.freedesktop.org/show_bug.cgi?id=15407 + +commit 3193b434c469ccfedbdd1b4fb12d550b24c4a858 +Author: Sergey V. Udaltsov <s...@gnome.org> +Date: Sun Apr 17 11:29:35 2011 +0100 + + Slightly improved algorighm + + Consider olpc/htcdream models, use extras + +commit 0f0b531787de7253c4fc635bbff5a97b205e7cdf +Author: Sergey V. Udaltsov <s...@gnome.org> +Date: Sun Apr 17 11:29:15 2011 +0100 + + A bit more sync in descriptions (for olpc) + +commit a71996de1e6f14c44f2930359ce6dae779c72854 +Author: Sergey V. Udaltsov <s...@gnome.org> +Date: Sun Apr 17 11:16:09 2011 +0100 + + Sync descriptions in lv extras + +commit 19a0026b5a8bd01cfc21bc8c7342e1c4f4567161 +Author: Sergey V. Udaltsov <s...@gnome.org> +Date: Fri Apr 15 00:42:55 2011 +0100 + + Moving ca(shs) into extras + + There are only 1650 speakers + http://en.wikipedia.org/wiki/Shuswap_language + +commit ec1f5af5d16ef9ccbb23b74cbe82f11b311d7293 +Author: Sergey V. Udaltsov <s...@gnome.org> +Date: Fri Apr 15 00:36:36 2011 +0100 + + Moving ca(kut) to extras + + There are only 12 speakers, as of 1999 + http://en.wikipedia.org/wiki/Kutenai_language + +commit 8670a90aed89941399aba28c3aeeab6c1e21a276 +Author: Aldis Berjoza <al...@bsdroot.lv> +Date: Thu Apr 14 23:26:57 2011 +0300 + + Update Latvian Modern layout to latest version + + * This Latvian Modern update fixes one flaw related to pipe character, + which now can be accesses with AltGr + m (Latvian Moder layout). + * This is most important to SH programmers. + * Other layout changes are minnor. + * Remove tailing whitespace + +commit 4c4fa09854f54b2d384a527ab0868a2ad04acec1 +Author: Sergey V. Udaltsov <s...@gnome.org> +Date: Wed Apr 13 21:47:35 2011 +0100 + + Broken compat mapping removed + + https://bugs.freedesktop.org/show_bug.cgi?id=36191 + +commit 94960d300cd669cc1b856c76dfbfccf7903f4b8e +Author: Sergey V. Udaltsov <s...@gnome.org> +Date: Wed Apr 13 21:42:31 2011 +0100 + + Rolling back wrong mapping of AB09 in hu + + https://bugs.freedesktop.org/show_bug.cgi?id=28091 + +commit 8cbaa231545ae269351f86c8a663546eb0be323c +Author: Sergey V. Udaltsov <s...@gnome.org> +Date: Tue Apr 12 21:58:31 2011 +0100 + + Fixed Saami back to Northern Saami + + https://bugs.freedesktop.org/show_bug.cgi?id=35752 + +commit ff23484a6cd9318b616cbac40469c17e50ef84b2 +Author: Aldis Berjoza <al...@bsdroot.lv> +Date: Tue Apr 12 03:23:20 2011 +0300 + + Added new Latvian keyboard layouts + + And Latvian Modernd layouts (invented and created by Valdis Vītoliņš)* + Add Latvian (ŪGJRMV) Ergonomic (created by Valdis Vītoliņš)* + Add Latvian Latvian Adapted (invented and created by Valdis Vītoliņš)* + Add US-Dvorac compatible Latvian layouts + Add programmer US-Dvorac compatible Latvian layouts + Add US-Colemak compatible Latvian layouts + + *) Reference: http://odo.lv/LatvianKeyboard + +commit 110b4ffa4fac8c74608af79bea7010df3721a572 +Author: Sergey V. Udaltsov <s...@gnome.org> +Date: Sat Apr 9 02:08:51 2011 +0100 + + Sync group names with layout names + +commit e144b5acfe939f01d7c0d249ebfddca5f3bad32b +Author: Sergey V. Udaltsov <s...@gnome.org> +Date: Sat Apr 9 02:07:03 2011 +0100 + + Fixed some descriptions + +commit b823a3861b88c19389a0e5edba947cc7ce3d8571 +Author: Sergey V. Udaltsov <s...@gnome.org> +Date: Wed Apr 6 21:16:03 2011 +0100 + + Missing bracket restored + +commit 4e2cb01ad0ef957a18d684ba225d672d1b6a3bb8 Author: Sergey V. Udaltsov <s...@gnome.org> Date: Tue Apr 5 23:26:14 2011 +0100 bashism eliminated - (cherry picked from commit 4e2cb01ad0ef957a18d684ba225d672d1b6a3bb8) -commit 764f32e0d779fcb7c367b442db76e515006d6a30 +commit 161cb4ffe01ea2bf8d94a4c3f5e21dc279dacf00 Author: Sergey V. Udaltsov <s...@gnome.org> Date: Tue Apr 5 23:24:34 2011 +0100 Fixed runtime deps checking The condition was missing - (cherry picked from commit 161cb4ffe01ea2bf8d94a4c3f5e21dc279dacf00) + +commit f272c002f4ef6a74b00a699e96c506e186666aad +Author: Sergey V. Udaltsov <s...@gnome.org> +Date: Tue Apr 5 00:17:02 2011 +0100 + + Unneeded Crimean Tatar variants removed from Romanian file + + https://bugs.freedesktop.org/show_bug.cgi?id=23544 + +commit 187f749264990d00490dc9b7e793b5e13d0051f2 +Author: Sergey V. Udaltsov <s...@gnome.org> +Date: Tue Apr 5 00:14:49 2011 +0100 + + Fixed descriptions for Crimean Tatar layouts + + https://bugs.freedesktop.org/show_bug.cgi?id=35787 + +commit 5f7a1b31d4cd9f42f8d5e9ac8bde3b9e16e2d99d +Author: Sergey V. Udaltsov <s...@gnome.org> +Date: Mon Apr 4 23:23:40 2011 +0100 + + Put consistency into Saami variants (descriptions) + +commit 9c8448b8c432e6a08d50a6858e3208f43730e71a +Author: Sergey V. Udaltsov <s...@gnome.org> +Date: Mon Apr 4 23:19:11 2011 +0100 + + Small polish on descriptions, more consistency + +commit 4945e1c758f06687cd19c2d82460529daa9070d7 +Author: Sergey V. Udaltsov <s...@gnome.org> +Date: Mon Apr 4 23:13:41 2011 +0100 + + A number of group names synced with rules/base.xml.in + +commit e69b552147c4197cd536bdea3df801fb89c367c4 +Author: Sergey V. Udaltsov <s...@gnome.org> +Date: Sun Apr 3 21:42:55 2011 +0100 + + Updated group names for all a* files commit ee0654f28bfdbdc5fed3a0477c1d58a55d85127f Author: Sergey V. Udaltsov <s...@gnome.org> diff --git a/debian/changelog b/debian/changelog index a3fd2f8..7af94ef 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +xkeyboard-config (2.3-1) UNRELEASED; urgency=low + + * New upstream release. + + -- Cyril Brulebois <k...@debian.org> Fri, 03 Jun 2011 23:56:14 +0200 + xkeyboard-config (2.2.1-1) experimental; urgency=low * New upstream release: commit 0012006e23556fcc565a6ce2d7d265c28d876bff Author: Sergey V. Udaltsov <s...@gnome.org> Date: Tue May 31 20:15:03 2011 +0100 Preparing 2.3 diff --git a/NEWS b/NEWS index 306c1e6..98ac6c0 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,6 @@ +2.3 First scheduled (and reasonably polished) release since GNOME3. + Serious cleanup of descriptions + 18 bugfixes, updated translations 2.2 Non-scheduled release for GNOME3. Major change in the structure of descriptions. Some new stuff added too. commit 0631d0ab16a89f2da8fcbbd8d8b77a3b39bdd998 Author: Sergey V. Udaltsov <s...@gnome.org> Date: Tue May 31 20:12:23 2011 +0100 Added localisation 'ja' diff --git a/configure.in b/configure.in index f692d5b..e4008a9 100644 --- a/configure.in +++ b/configure.in @@ -67,7 +67,7 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Gettext package]) AM_GLIB_GNU_GETTEXT -ALL_LINGUAS="af az bg ca crh cs da de el en_GB eo es fi fr gl hu id it ka ko ky lt nb nl pl ro ru rw sk sl sq sr sv tr uk vi zh_CN zh_TW" +ALL_LINGUAS="af az bg ca crh cs da de el en_GB eo es fi fr gl hu id it ja ka ko ky lt nb nl pl ro ru rw sk sl sq sr sv tr uk vi zh_CN zh_TW" AC_SUBST(xkb_base) AC_SUBST(xkb_rules_symlink) commit d9338c0018a05b50bab8d8b70ee0a61e74c32ac3 Author: Sergey V. Udaltsov <s...@gnome.org> Date: Tue May 31 20:11:28 2011 +0100 Updated translations from TP Including https://bugs.freedesktop.org/show_bug.cgi?id=37565 diff --git a/po/bg.po b/po/bg.po index 04c813a..29adf25 100644 --- a/po/bg.po +++ b/po/bg.po @@ -1,3101 +1,3918 @@ # Bulgarian translation of xkeyboard-config. # Copyright (C) 2002, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. -# Copyright (C) 2009, 2010 Free Software Foundation, Inc. +# Copyright (C) 2009, 2010, 2011 Free Software Foundation, Inc. # This file is distributed under the same license as the xkeyboard-config package. -# Alexander Shopov <a...@kambanaria.org>, 2002, 2005, 2006, 2007, 2008, 2009, 2010. +# Alexander Shopov <a...@kambanaria.org>, 2002, 2005, 2006, 2007, 2008, 2009, 2010, 2011. # Damyan Ivanov <dam+gn...@ktnx.net>, 2010. # +# +# = Правила за съкращение на език: = +# +# 1. Започва с главна, продължава с малки букви +# +# 2. Винаги трибуквено — някои от вариантите в оригинал са 3 буквени, +# няма защо да сме по-малко информативни от това +# +# 3. Ако оригиналът или полученото съкращение е под 3 букви, се допълва +# с интервали без разделяне „ “ - U+00A0 NO-BREAK SPACE - да се +# уеднакви широчината на надписа доколкото е възмоно +# +# 4. Взима се първата буква, изпускат се буквите „аъоуеиюяйь“ и се +# взимат 2-та и третата от останалите букви. +# +# 5. В случаите, когато това правило води до повтарящи се имена, +# полученото име не се ползва, а се търси съкращения, които по-точно +# идентифицират резултата. Често е достатъчно ползването на първите три +# букви. Пример: белгийска — блгск → Блг, българска — блгрск → Блг; +# вместо това: белгийска → Бел, българска → Бъл. Пример: латвийска — +# лтвск → Лтв, литовска — лтвск → Лтв; вместо това латвийска → Лат, +# литовска → Лит. В много редките случаи (1) когато и това не е +# достатъчно, се работи ad hoc. +# +# = Правила за означение на подредба: = +# +# Някои подредби се идентифицират с местата на определени знаци. Пример +# qwerty, Bepo, Q при турските. Това означение се изписва с правилните +# знаци, главна буква, ако е една, и малки, ако са повече → qwerty, +# bépo, Q. +# +# = Правила за знаци = +# +# Знаците се изписват графично, не се описват — „€“, а не евро. Думата +# „знак“ се избягва. Знаците се слагат в български кавички. Ако графично +# силно приличат на българските кавички, се ползват френски, и се гледа +# в рамките на едно съобщение цитирането да се прави с еднакви кавички. +# +# = Правила за пунктуация = +# +# Предпочита се дълго тире „—“ пред скоби „()“. msgid "" msgstr "" -"Project-Id-Version: xkeyboard-config-2.1-pre1\n" +"Project-Id-Version: xkeyboard-config-2.3\n" "Report-Msgid-Bugs-To: s...@users.sourceforge.net\n" -"POT-Creation-Date: 2011-01-12 00:16+0000\n" -"PO-Revision-Date: 2011-01-15 16:09+0200\n" +"POT-Creation-Date: 2011-05-17 21:08+0100\n" +"PO-Revision-Date: 2011-05-19 06:23+0300\n" "Last-Translator: Alexander Shopov <a...@kambanaria.org>\n" "Language-Team: Bulgarian <d...@fsa-bg.org>\n" +"Language: bg\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: bg\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" #: ../rules/base.xml.in.h:1 msgid "<Less/Greater>" -msgstr "<По-малко/по-голямо>" +msgstr "„<>“" #: ../rules/base.xml.in.h:2 -msgid "<Less/Greater> chooses 5th level, locks when pressed together with another 5th-level-chooser" -msgstr "<По-малко/по-голямо> избира петото ниво и го заключва заедно с друг клавиш за пето ниво" +msgid "" +"<Less/Greater> (chooses 3rd level, latches when pressed together with " +"another 3rd-level-chooser)" +msgstr "" +"„<>“ избира третото ниво и го заключва заедно с друг клавиш за трето " +"ниво" #: ../rules/base.xml.in.h:3 -msgid "<Less/Greater> chooses 5th level, locks when pressed together with another 5th-level-chooser, one press releases the lock" -msgstr "<По-малко/по-голямо> избира петото ниво, заключва го заедно с друг клавиш за пето ниво и го отключва при единично натискане" +msgid "" +"<Less/Greater> chooses 5th level and activates level5-Lock when " +"pressed together with another 5th-level-chooser, one press releases the lock" +msgstr "" +"„<>“ избира петото ниво, заключва го заедно с друг клавиш за пето ниво " +"и го отключва при единично натискане" #: ../rules/base.xml.in.h:4 -msgid "(F)" -msgstr "(F)" +msgid "" +"<Less/Greater> chooses 5th level, locks when pressed together with " +"another 5th-level-chooser" +msgstr "" +"„<>“ избира петото ниво и го заключва заедно с друг клавиш за пето ниво" #: ../rules/base.xml.in.h:5 -msgid "(Legacy) Alternative" -msgstr "(остаряла) алтернативна" +msgid "" +"<Less/Greater> chooses 5th level, locks when pressed together with " +"another 5th-level-chooser, one press releases the lock" +msgstr "" +"„<>“ избира петото ниво, заключва го заедно с друг клавиш за пето ниво " +"и го отключва при единично натискане" #: ../rules/base.xml.in.h:6 -msgid "(Legacy) Alternative, Sun dead keys" -msgstr "(остаряла) алтернативна, с „мъртви“ клавиши на Sun" +msgid "A4Tech KB-21" +msgstr "A4Tech KB-21" #: ../rules/base.xml.in.h:7 -msgid "(Legacy) Alternative, eliminate dead keys" -msgstr "(остаряла) алтернативна, без „мъртви“ клавиши" +msgid "A4Tech KBS-8" +msgstr "A4Tech KBS-8" #: ../rules/base.xml.in.h:8 -msgid "101/104 key Compatible" -msgstr "Съвместима със 101/104 клавиша" +msgid "A4Tech Wireless Desktop RFKB-23" +msgstr "A4Tech Wireless Desktop RFKB-23 — безжична" #: ../rules/base.xml.in.h:9 -msgid "101/qwerty/comma/Dead keys" -msgstr "101/qwerty/запетая/с „мъртви“ клавиши" +msgid "ATM/phone-style" +msgstr "Като банкомат/телефон" #: ../rules/base.xml.in.h:10 -msgid "101/qwerty/comma/Eliminate dead keys" -msgstr "101/qwerty/запетая/без „мъртви“ клавиши" +msgid "Acer AirKey V" +msgstr "Acer AirKey V" #: ../rules/base.xml.in.h:11 -msgid "101/qwerty/dot/Dead keys" -msgstr "101/qwerty/точка/с „мъртви“ клавиши" +msgid "Acer C300" +msgstr "Acer C300" #: ../rules/base.xml.in.h:12 -msgid "101/qwerty/dot/Eliminate dead keys" -msgstr "101/qwerty/точка/без „мъртви“ клавиши" +msgid "Acer Ferrari 4000" +msgstr "Acer Ferrari 4000" #: ../rules/base.xml.in.h:13 -msgid "101/qwertz/comma/Dead keys" -msgstr "101/qwertz/запетая/с „мъртви“ клавиши" +msgid "Acer Laptop" +msgstr "Acer, за мобилен компютър" #: ../rules/base.xml.in.h:14 -msgid "101/qwertz/comma/Eliminate dead keys" -msgstr "101/qwertz/запетая/без „мъртви“ клавиши" +msgid "Add the standard behavior to Menu key" +msgstr "Добавяне на стандартното поведение на Menu" #: ../rules/base.xml.in.h:15 -msgid "101/qwertz/dot/Dead keys" -msgstr "101/qwertz/точка/с „мъртви“ клавиши" +msgid "Adding Esperanto circumflexes (supersigno)" +msgstr "Добавяне на двойните ударения на Esperanto" #: ../rules/base.xml.in.h:16 -msgid "101/qwertz/dot/Eliminate dead keys" -msgstr "101/qwertz/точка/без „мъртви“ клавиши" +msgid "Adding currency signs to certain keys" +msgstr "Добавяне на знак за валута към някои клавиши" #: ../rules/base.xml.in.h:17 -msgid "102/qwerty/comma/Dead keys" -msgstr "102/qwerty/запетая/с „мъртви“ клавиши" +msgid "Advance Scorpius KI" +msgstr "Advance Scorpius KI" #: ../rules/base.xml.in.h:18 -msgid "102/qwerty/comma/Eliminate dead keys" -msgstr "102/qwerty/запетая/без „мъртви“ клавиши" +msgid "Afghani" +msgstr "афганистанска" #: ../rules/base.xml.in.h:19 -msgid "102/qwerty/dot/Dead keys" -msgstr "102/qwerty/точка/с „мъртви“ клавиши" +msgid "Akan" +msgstr "аканска" #: ../rules/base.xml.in.h:20 -msgid "102/qwerty/dot/Eliminate dead keys" -msgstr "102/qwerty/точка/без „мъртви“ клавиши" +msgid "Albanian" +msgstr "албанска" #: ../rules/base.xml.in.h:21 -msgid "102/qwertz/comma/Dead keys" -msgstr "102/qwertz/запетая/с „мъртви“ клавиши" +msgid "Alt and Meta are on Alt keys" +msgstr "Alt-овете отговарят на Meta и на Alt" #: ../rules/base.xml.in.h:22 -msgid "102/qwertz/comma/Eliminate dead keys" -msgstr "102/qwertz/запетая/без „мъртви“ клавиши" +msgid "Alt is mapped to Right Win, Super to Menu" +msgstr "Десният Win е Alt, а Menu — Super" #: ../rules/base.xml.in.h:23 -msgid "102/qwertz/dot/Dead keys" -msgstr "102/qwertz/точка/с „мъртви“ клавиши" +msgid "Alt+Caps Lock" +msgstr "Alt+Caps Lock" #: ../rules/base.xml.in.h:24 -msgid "102/qwertz/dot/Eliminate dead keys" -msgstr "102/qwertz/точка/без „мъртви“ клавиши" +msgid "Alt+Ctrl" +msgstr "Alt+Ctrl" #: ../rules/base.xml.in.h:25 -msgid "A4Tech KB-21" -msgstr "A4Tech KB-21" +msgid "Alt+Shift" +msgstr "Alt+Shift" #: ../rules/base.xml.in.h:26 -msgid "A4Tech KBS-8" -msgstr "A4Tech KBS-8" +msgid "Alt+Space" +msgstr "Alt+Space" #: ../rules/base.xml.in.h:27 -msgid "A4Tech Wireless Desktop RFKB-23" -msgstr "A4Tech Wireless Desktop RFKB-23 (безжична)" +msgid "Alt/Win key behavior" +msgstr "Поведение на Alt/Win" #: ../rules/base.xml.in.h:28 -msgid "ATM/phone-style" -msgstr "Като банкомат/телефон" +msgid "Amharic" +msgstr "амхарска" #: ../rules/base.xml.in.h:29 -msgid "Acer AirKey V" -msgstr "Acer AirKey V" +msgid "Any Alt key" +msgstr "Всеки Alt" #: ../rules/base.xml.in.h:30 -msgid "Acer C300" -msgstr "Acer C300" +msgid "Any Win key" +msgstr "Всеки Win" #: ../rules/base.xml.in.h:31 -msgid "Acer Ferrari 4000" -msgstr "Acer Ferrari 4000" +msgid "Any Win key (while pressed)" +msgstr "Всеки Win (докато е натиснат)" #: ../rules/base.xml.in.h:32 -msgid "Acer Laptop" -msgstr "Acer, за мобилен компютър" +msgid "Apple" +msgstr "Apple" #: ../rules/base.xml.in.h:33 -msgid "Add the standard behavior to Menu key" -msgstr "Добавяне на стандартното поведение на Menu" +msgid "Apple Aluminium Keyboard (ANSI)" +msgstr "Apple Aluminium Keyboard — стандарт ANSI" #: ../rules/base.xml.in.h:34 -msgid "Adding Esperanto circumflexes (supersigno)" -msgstr "Добавяне на двойните ударения на Esperanto" +msgid "Apple Aluminium Keyboard (ISO)" +msgstr "Apple Aluminium Keyboard — стандарт ISO" #: ../rules/base.xml.in.h:35 -msgid "Adding currency signs to certain keys" -msgstr "Добавяне на знак за валута към някои клавиши" +msgid "Apple Aluminium Keyboard (JIS)" +msgstr "Apple Aluminium Keyboard — стандарт JIS" #: ../rules/base.xml.in.h:36 -msgid "Advance Scorpius KI" -msgstr "Advance Scorpius KI" +msgid "" +"Apple Aluminium Keyboard: emulate PC keys (Print, Scroll Lock, Pause, Num " +"Lock)" +msgstr "" +"Apple Aluminium Keyboard — симулиране на клавиши за PC (Print, Scroll Lock, " +"Pause, Num Lock)" #: ../rules/base.xml.in.h:37 -msgid "Afg" -msgstr "Афг" +msgid "Apple Laptop" +msgstr "Apple, за мобилен компютър" #: ../rules/base.xml.in.h:38 -msgid "Afghanistan" -msgstr "афганистанска" +msgid "Arabic" +msgstr "арабска" #: ../rules/base.xml.in.h:39 -msgid "Akan" -msgstr "акан" +msgid "Arabic (Buckwalter)" +msgstr "арабска — транслитерация по Бъкуолтър" #: ../rules/base.xml.in.h:40 -msgid "Alb" -msgstr "Алб" +msgid "Arabic (Morocco)" +msgstr "арабска — мароканска" #: ../rules/base.xml.in.h:41 -msgid "Albania" -msgstr "албанска" +msgid "Arabic (Pakistan)" +msgstr "арабска — пакистанска" #: ../rules/base.xml.in.h:42 -msgid "Alt and Meta are on Alt keys" -msgstr "Alt-овете отговарят на Meta и на Alt" +msgid "Arabic (Syria)" +msgstr "арабска — сирийска" #: ../rules/base.xml.in.h:43 -msgid "Alt is mapped to Right Win, Super to Menu" -msgstr "Десният Win е Alt, а Menu — Super" +msgid "Arabic (azerty)" +msgstr "арабска — azerty" #: ../rules/base.xml.in.h:44 -msgid "Alt+Caps Lock" -msgstr "Alt+Caps Lock" +msgid "Arabic (azerty/digits)" +msgstr "арабска — azerty/цифри" #: ../rules/base.xml.in.h:45 -msgid "Alt+Ctrl" -msgstr "Alt+Ctrl" -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/e1qsd2a-0003sv...@vasks.debian.org