NEWS | 2
configure.ac | 3
debian/changelog | 7
debian/control | 2
keycodes/Makefile.am | 1
keycodes/jolla | 10
po/bg.po | 1797 +++++++++++++++++++------------------
po/ca.po | 1500 +++++++++++++++----------------
po/cs.po | 1502 +++++++++++++++----------------
po/de.po | 1502 +++++++++++++++----------------
po/fi.po | 1627 +++++++++++++++++----------------
po/fr.po | 1501 +++++++++++++++----------------
po/gl.po | 1769 +++++++++++++++++++-----------------
po/hu.po | 1773 +++++++++++++++++++-----------------
po/ko.po | 1500 +++++++++++++++----------------
po/nl.po | 1500 +++++++++++++++----------------
po/pl.po | 1500 +++++++++++++++----------------
po/ru.po | 1500 +++++++++++++++----------------
po/sv.po | 1504 +++++++++++++++----------------
po/uk.po | 1500 +++++++++++++++----------------
po/vi.po | 1968 ++++++++++++++++++++---------------------
rules/base.extras.xml.in | 6
rules/base.lists.part | 3
rules/base.ml1_s.part | 1
rules/base.ml_s.part | 2
rules/base.o_s.part | 2
rules/base.xml.in | 34
rules/compat/base.l1v1_c.part | 1
rules/compat/base.l2v2_c.part | 1
rules/compat/base.l3v3_c.part | 1
rules/compat/base.l4v4_c.part | 1
rules/compat/base.lv_c.part | 1
rules/evdev.m_k.part | 1
symbols/Makefile.am | 4
symbols/altwin | 7
symbols/az | 27
symbols/br | 1
symbols/capslock | 5
symbols/de | 80 +
symbols/fr | 86 +
symbols/group | 4
symbols/is | 1
symbols/jolla_vndr/Makefile.am | 4
symbols/jolla_vndr/sbj | 57 +
symbols/tg | 76 +
symbols/us | 4
types/level5 | 242 ++---
47 files changed, 12769 insertions(+), 11851 deletions(-)
New commits:
commit c8bfd9f1511917cd2430057dcd2a610c76e3a17a
Author: Julien Cristau <jcris...@debian.org>
Date: Sun Feb 21 15:56:56 2016 +0000
Upload to unstable
diff --git a/debian/changelog b/debian/changelog
index 3c25801..0a037dd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-xkeyboard-config (2.17-1) UNRELEASED; urgency=medium
+xkeyboard-config (2.17-1) unstable; urgency=medium
* New upstream release
* Use https instead of git for Vcs-Git.
- -- Julien Cristau <jcris...@debian.org> Sun, 21 Feb 2016 15:06:03 +0000
+ -- Julien Cristau <jcris...@debian.org> Sun, 21 Feb 2016 15:56:50 +0000
xkeyboard-config (2.16-1) unstable; urgency=medium
commit 7373f8d7be4fb166bbc5e2cc48862f93f7bd4b97
Author: Julien Cristau <jcris...@debian.org>
Date: Sun Feb 21 15:56:49 2016 +0000
Use https instead of git for Vcs-Git.
diff --git a/debian/changelog b/debian/changelog
index e1ea463..3c25801 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
xkeyboard-config (2.17-1) UNRELEASED; urgency=medium
* New upstream release
+ * Use https instead of git for Vcs-Git.
-- Julien Cristau <jcris...@debian.org> Sun, 21 Feb 2016 15:06:03 +0000
diff --git a/debian/control b/debian/control
index 343f25c..f45aac9 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,7 @@ Build-Depends-Indep:
xsltproc,
xutils-dev (>= 1:7.6+2),
Standards-Version: 3.9.6
-Vcs-Git: git://anonscm.debian.org/git/pkg-xorg/data/xkb-data
+Vcs-Git: https://anonscm.debian.org/git/pkg-xorg/data/xkb-data.git
Vcs-Browser: https://anonscm.debian.org/cgit/pkg-xorg/data/xkb-data.git
Homepage: http://www.freedesktop.org/Software/XKeyboardConfig
commit 3fa2c2a3285838dac4df4ed4f54096834332f5b2
Author: Julien Cristau <jcris...@debian.org>
Date: Sun Feb 21 15:47:30 2016 +0000
Bump changelog
diff --git a/debian/changelog b/debian/changelog
index 5e62492..e1ea463 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xkeyboard-config (2.17-1) UNRELEASED; urgency=medium
+
+ * New upstream release
+
+ -- Julien Cristau <jcris...@debian.org> Sun, 21 Feb 2016 15:06:03 +0000
+
xkeyboard-config (2.16-1) unstable; urgency=medium
* Team upload.
commit 4a48ae39506bfd78db073376ce21dbbdc48dc55d
Author: Sergey Udaltsov <sergey.udalt...@gmail.com>
Date: Tue Jan 26 20:57:11 2016 +0000
release 2.17, small commit added
diff --git a/NEWS b/NEWS
index fe4495d..6a67c5a 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-2.17 12 bugs fixed
+2.17 13 bugs fixed
Translations updated
2.16 10 bugs fixed
Translations updated
commit 7ef27b8b261e8eafd153ac47f3841b8db302afb2
Author: Sergey Udaltsov <sergey.udalt...@gmail.com>
Date: Tue Jan 26 20:51:40 2016 +0000
Reenable layer5-lock for de variants
https://bugs.freedesktop.org/show_bug.cgi?id=93763
diff --git a/symbols/de b/symbols/de
index 90910e0..c16a462 100644
--- a/symbols/de
+++ b/symbols/de
@@ -339,7 +339,7 @@ xkb_symbols "neo_base" {
// Alphanumeric-keys
// ===============
- key.type[Group1] = "EIGHT_LEVEL";
+ key.type[Group1] = "EIGHT_LEVEL_LEVEL_FIVE_LOCK";
// Tab as Multi_key (Compose)
// --------------------------------------------------------------
@@ -367,7 +367,7 @@ xkb_symbols "neo_base" {
// Top row
// --------------------------------------------------------------
- key.type[Group1] = "EIGHT_LEVEL_SEMIALPHABETIC";
+ key.type[Group1] = "EIGHT_LEVEL_ALPHABETIC_LEVEL_FIVE_LOCK";
key <AD01> { [ x, X, ellipsis,
Greek_xi, Prior, Prior,
Greek_XI, NoSymbol ] };
key <AD02> { [ v, V,
underscore, NoSymbol, BackSpace,
BackSpace, radical, NoSymbol ] };
key <AD03> { [ l, L,
bracketleft, Greek_lambda, Up, Up,
Greek_LAMBDA, NoSymbol ] };
@@ -382,12 +382,12 @@ xkb_symbols "neo_base" {
key <AD11> { [ ssharp, U1E9E, U017F,
Greek_finalsmallsigma, U2212, NoSymbol,
jot, NoSymbol ] };
- key.type[Group1] = "EIGHT_LEVEL";
+ key.type[Group1] = "EIGHT_LEVEL_LEVEL_FIVE_LOCK";
key <AD12> { [ dead_acute, dead_tilde,
dead_stroke, dead_psili, dead_doubleacute,
NoSymbol, dead_breve, NoSymbol ] };
// Middle row
// --------------------------------------------------------------
- key.type[Group1] = "EIGHT_LEVEL_SEMIALPHABETIC";
+ key.type[Group1] = "EIGHT_LEVEL_ALPHABETIC_LEVEL_FIVE_LOCK";
key <AC01> { [ u, U,
backslash, NoSymbol, Home,
Home, includedin, NoSymbol ] };
key <AC02> { [ i, I, slash,
Greek_iota, Left, Left,
integral, NoSymbol ] };
key <AC03> { [ a, A,
braceleft, Greek_alpha, Down,
Down, U2200, NoSymbol ] };
@@ -412,12 +412,12 @@ xkb_symbols "neo_base" {
key <AB06> { [ b, B, plus,
Greek_beta, colon, NoSymbol,
U21D0, NoSymbol ] };
key <AB07> { [ m, M, percent,
Greek_mu, KP_1, KP_1,
ifonlyif, NoSymbol ] };
- key.type[Group1] = "EIGHT_LEVEL";
+ key.type[Group1] = "EIGHT_LEVEL_LEVEL_FIVE_LOCK";
key <AB08> { [ comma, endash, quotedbl,
U03F1, KP_2, KP_2,
U21D2, NoSymbol ] };
key <AB09> { [ period, enfilledcircbullet,
apostrophe, U03D1, KP_3,
KP_3, U21A6, NoSymbol ] };
- key.type[Group1] = "EIGHT_LEVEL_SEMIALPHABETIC";
+ key.type[Group1] = "EIGHT_LEVEL_ALPHABETIC_LEVEL_FIVE_LOCK";
key <AB10> { [ j, J,
semicolon, Greek_theta, semicolon,
NoSymbol, Greek_THETA, NoSymbol ] };
- key.type[Group1] = "EIGHT_LEVEL";
+ key.type[Group1] = "EIGHT_LEVEL_LEVEL_FIVE_LOCK";
// Space key
// --------------------------------------------------------------
@@ -473,8 +473,8 @@ xkb_symbols "neo" {
include "shift(both_capslock)"
include "level3(caps_switch)"
include "level3(bksl_switch)"
- include "level5(lsgt_switch)"
- include "level5(ralt_switch)"
+ include "level5(lsgt_switch_lock)"
+ include "level5(ralt_switch_lock)"
};
// Copied from macintosh_vndr/de
@@ -788,11 +788,11 @@ partial alphanumeric_keys
xkb_symbols "adnw_base" {
include "de(neo_base)"
- key.type[Group1] = "EIGHT_LEVEL";
+ key.type[Group1] = "EIGHT_LEVEL_LEVEL_FIVE_LOCK";
key <AD04> { [ period, enfilledcircbullet, NoSymbol,
U03D1, NoSymbol, NoSymbol,
U21A6, NoSymbol ] };
key <AB04> { [ comma, endash, NoSymbol,
U03F1, NoSymbol, NoSymbol,
U21D2, NoSymbol ] };
- key.type[Group1] = "EIGHT_LEVEL_SEMIALPHABETIC";
+ key.type[Group1] = "EIGHT_LEVEL_ALPHABETIC_LEVEL_FIVE_LOCK";
key <AD01> { [ k, K, NoSymbol,
Greek_kappa, NoSymbol, NoSymbol,
multiply, NoSymbol ] };
key <AD02> { [ u, U, NoSymbol,
NoSymbol, NoSymbol, NoSymbol,
includedin, NoSymbol ] };
key <AD03> { [ udiaeresis, Udiaeresis, NoSymbol,
NoSymbol, NoSymbol, NoSymbol,
union, NoSymbol ] };
@@ -835,19 +835,19 @@ xkb_symbols "adnw" {
include "shift(both_capslock)"
include "level3(caps_switch)"
include "level3(bksl_switch)"
- include "level5(lsgt_switch)"
- include "level5(ralt_switch)"
+ include "level5(lsgt_switch_lock)"
+ include "level5(ralt_switch_lock)"
};
partial alphanumeric_keys
xkb_symbols "koy_base" {
include "de(neo_base)"
- key.type[Group1] = "EIGHT_LEVEL";
+ key.type[Group1] = "EIGHT_LEVEL_LEVEL_FIVE_LOCK";
key <AD02> { [ period, enfilledcircbullet, NoSymbol,
U03D1, NoSymbol, NoSymbol,
U21A6, NoSymbol ] };
key <AD04> { [ comma, endash, NoSymbol,
U03F1, NoSymbol, NoSymbol,
U21D2, NoSymbol ] };
- key.type[Group1] = "EIGHT_LEVEL";
+ key.type[Group1] = "EIGHT_LEVEL_ALPHABETIC_LEVEL_FIVE_LOCK";
key <AD01> { [ k, K, NoSymbol,
Greek_kappa, NoSymbol, NoSymbol,
multiply, NoSymbol ] };
key <AD03> { [ o, O, NoSymbol,
Greek_omicron, NoSymbol, NoSymbol,
elementof, NoSymbol ] };
key <AD05> { [ y, Y, NoSymbol,
Greek_upsilon, NoSymbol, NoSymbol,
nabla, NoSymbol ] };
@@ -890,6 +890,6 @@ xkb_symbols "koy" {
include "shift(both_capslock)"
include "level3(caps_switch)"
include "level3(bksl_switch)"
- include "level5(lsgt_switch)"
- include "level5(ralt_switch)"
+ include "level5(lsgt_switch_lock)"
+ include "level5(ralt_switch_lock)"
};
diff --git a/types/level5 b/types/level5
index 1796f50..0570725 100644
--- a/types/level5
+++ b/types/level5
@@ -53,127 +53,127 @@ partial default xkb_types "default" {
level_name[Level8] = "X Shift Alt";
};
-// type "EIGHT_LEVEL_LEVEL_FIVE_LOCK" {
-// // Level5-Lock is implemented by using NumLock, because a real modifier
-// // is required.
-//
-// modifiers = Shift + Lock + LevelThree + NumLock + LevelFive;
-//
-// map[None] = Level1;
-// map[Shift] = Level2;
-// map[LevelThree] = Level3;
-// map[LevelThree+Shift] = Level4;
-//
-// map[LevelFive] = Level5;
-// map[LevelFive+Shift] = Level6;
-// map[LevelFive+LevelThree] = Level7;
-// map[LevelFive+LevelThree+Shift] = Level8;
-//
-// map[NumLock] = Level5;
-// map[NumLock+Shift] = Level6;
-// map[NumLock+LevelThree] = Level7;
-// map[NumLock+LevelThree+Shift] = Level8;
-//
-// map[NumLock+LevelFive] = Level1;
-// map[NumLock+LevelFive+Shift] = Level2;
-// map[NumLock+LevelFive+LevelThree] = Level3;
-// map[NumLock+LevelFive+LevelThree+Shift] = Level4;
-//
-// // Lock has no effect
-// map[Lock] = Level1;
-// map[Lock+Shift] = Level2;
-// map[Lock+LevelThree] = Level3;
-// map[Lock+LevelThree+Shift] = Level4;
-//
-// map[Lock+LevelFive] = Level5;
-// map[Lock+LevelFive+Shift] = Level6;
-// map[Lock+LevelFive+LevelThree] = Level7;
-// map[Lock+LevelFive+LevelThree+Shift] = Level8;
-//
-// map[Lock+NumLock] = Level5;
-// map[Lock+NumLock+Shift] = Level6;
-// map[Lock+NumLock+LevelThree] = Level7;
-// map[Lock+NumLock+LevelThree+Shift] = Level8;
-//
-// map[Lock+NumLock+LevelFive] = Level1;
-// map[Lock+NumLock+LevelFive+Shift] = Level2;
-// map[Lock+NumLock+LevelFive+LevelThree] = Level3;
-// map[Lock+NumLock+LevelFive+LevelThree+Shift] = Level4;
-//
-// preserve[LevelFive+Shift] = Shift;
-// preserve[NumLock+Shift] = Shift;
-// preserve[Lock+LevelFive+Shift] = Shift;
-// preserve[Lock+NumLock+Shift] = Shift;
-//
-// level_name[Level1] = "Base";
-// level_name[Level2] = "Shift";
-// level_name[Level3] = "Alt Base";
-// level_name[Level4] = "Shift Alt";
-// level_name[Level5] = "X";
-// level_name[Level6] = "X Shift";
-// level_name[Level7] = "X Alt Base";
-// level_name[Level8] = "X Shift Alt";
-// };
-//
-// type "EIGHT_LEVEL_ALPHABETIC_LEVEL_FIVE_LOCK" {
-// // Level5-Lock is implemented by using NumLock, because a real modifier
-// // is required.
-//
-// modifiers = Shift + Lock + LevelThree + NumLock + LevelFive;
-//
-// map[None] = Level1;
-// map[Shift] = Level2;
-// map[LevelThree] = Level3;
-// map[LevelThree+Shift] = Level4;
-//
-// map[LevelFive] = Level5;
-// map[LevelFive+Shift] = Level6;
-// map[LevelFive+LevelThree] = Level7;
-// map[LevelFive+LevelThree+Shift] = Level8;
-//
-// map[NumLock] = Level5;
-// map[NumLock+Shift] = Level6;
-// map[NumLock+LevelThree] = Level7;
-// map[NumLock+LevelThree+Shift] = Level8;
-//
-// map[NumLock+LevelFive] = Level1;
-// map[NumLock+LevelFive+Shift] = Level2;
-// map[NumLock+LevelFive+LevelThree] = Level3;
-// map[NumLock+LevelFive+LevelThree+Shift] = Level4;
-//
-// // Lock interchanges Level1 and Level2
-// map[Lock] = Level2;
-// map[Lock+Shift] = Level1;
-// map[Lock+LevelThree] = Level3;
-// map[Lock+LevelThree+Shift] = Level4;
-//
-// map[Lock+LevelFive] = Level5;
-// map[Lock+LevelFive+Shift] = Level6;
-// map[Lock+LevelFive+LevelThree] = Level7;
-// map[Lock+LevelFive+LevelThree+Shift] = Level8;
-//
-// map[Lock+NumLock] = Level5;
-// map[Lock+NumLock+Shift] = Level6;
-// map[Lock+NumLock+LevelThree] = Level7;
-// map[Lock+NumLock+LevelThree+Shift] = Level8;
-//
-// map[Lock+NumLock+LevelFive] = Level2;
-// map[Lock+NumLock+LevelFive+Shift] = Level1;
-// map[Lock+NumLock+LevelFive+LevelThree] = Level4;
-// map[Lock+NumLock+LevelFive+LevelThree+Shift] = Level3;
-//
-// preserve[LevelFive+Shift] = Shift;
-// preserve[NumLock+Shift] = Shift;
-//
-// level_name[Level1] = "Base";
-// level_name[Level2] = "Shift";
-// level_name[Level3] = "Alt Base";
-// level_name[Level4] = "Shift Alt";
-// level_name[Level5] = "X";
-// level_name[Level6] = "X Shift";
-// level_name[Level7] = "X Alt Base";
-// level_name[Level8] = "X Shift Alt";
-// };
+ type "EIGHT_LEVEL_LEVEL_FIVE_LOCK" {
+ // Level5-Lock is implemented by using NumLock, because a real modifier
+ // is required.
+
+ modifiers = Shift + Lock + LevelThree + NumLock + LevelFive;
+
+ map[None] = Level1;
+ map[Shift] = Level2;
+ map[LevelThree] = Level3;
+ map[LevelThree+Shift] = Level4;
+
+ map[LevelFive] = Level5;
+ map[LevelFive+Shift] = Level6;
+ map[LevelFive+LevelThree] = Level7;
+ map[LevelFive+LevelThree+Shift] = Level8;
+
+ map[NumLock] = Level5;
+ map[NumLock+Shift] = Level6;
+ map[NumLock+LevelThree] = Level7;
+ map[NumLock+LevelThree+Shift] = Level8;
+
+ map[NumLock+LevelFive] = Level1;
+ map[NumLock+LevelFive+Shift] = Level2;
+ map[NumLock+LevelFive+LevelThree] = Level3;
+ map[NumLock+LevelFive+LevelThree+Shift] = Level4;
+
+ // Lock has no effect
+ map[Lock] = Level1;
+ map[Lock+Shift] = Level2;
+ map[Lock+LevelThree] = Level3;
+ map[Lock+LevelThree+Shift] = Level4;
+
+ map[Lock+LevelFive] = Level5;
+ map[Lock+LevelFive+Shift] = Level6;
+ map[Lock+LevelFive+LevelThree] = Level7;
+ map[Lock+LevelFive+LevelThree+Shift] = Level8;
+
+ map[Lock+NumLock] = Level5;
+ map[Lock+NumLock+Shift] = Level6;
+ map[Lock+NumLock+LevelThree] = Level7;
+ map[Lock+NumLock+LevelThree+Shift] = Level8;
+
+ map[Lock+NumLock+LevelFive] = Level1;
+ map[Lock+NumLock+LevelFive+Shift] = Level2;
+ map[Lock+NumLock+LevelFive+LevelThree] = Level3;
+ map[Lock+NumLock+LevelFive+LevelThree+Shift] = Level4;
+
+ preserve[LevelFive+Shift] = Shift;
+ preserve[NumLock+Shift] = Shift;
+ preserve[Lock+LevelFive+Shift] = Shift;
+ preserve[Lock+NumLock+Shift] = Shift;
+
+ level_name[Level1] = "Base";
+ level_name[Level2] = "Shift";
+ level_name[Level3] = "Alt Base";
+ level_name[Level4] = "Shift Alt";
+ level_name[Level5] = "X";
+ level_name[Level6] = "X Shift";
+ level_name[Level7] = "X Alt Base";
+ level_name[Level8] = "X Shift Alt";
+ };
+
+ type "EIGHT_LEVEL_ALPHABETIC_LEVEL_FIVE_LOCK" {
+ // Level5-Lock is implemented by using NumLock, because a real modifier
+ // is required.
+
+ modifiers = Shift + Lock + LevelThree + NumLock + LevelFive;
+
+ map[None] = Level1;
+ map[Shift] = Level2;
+ map[LevelThree] = Level3;
+ map[LevelThree+Shift] = Level4;
+
+ map[LevelFive] = Level5;
+ map[LevelFive+Shift] = Level6;
+ map[LevelFive+LevelThree] = Level7;
+ map[LevelFive+LevelThree+Shift] = Level8;
+
+ map[NumLock] = Level5;
+ map[NumLock+Shift] = Level6;
+ map[NumLock+LevelThree] = Level7;
+ map[NumLock+LevelThree+Shift] = Level8;
+
+ map[NumLock+LevelFive] = Level1;
+ map[NumLock+LevelFive+Shift] = Level2;
+ map[NumLock+LevelFive+LevelThree] = Level3;
+ map[NumLock+LevelFive+LevelThree+Shift] = Level4;
+
+ // Lock interchanges Level1 and Level2
+ map[Lock] = Level2;
+ map[Lock+Shift] = Level1;
+ map[Lock+LevelThree] = Level3;
+ map[Lock+LevelThree+Shift] = Level4;
+
+ map[Lock+LevelFive] = Level5;
+ map[Lock+LevelFive+Shift] = Level6;
+ map[Lock+LevelFive+LevelThree] = Level7;
+ map[Lock+LevelFive+LevelThree+Shift] = Level8;
+
+ map[Lock+NumLock] = Level5;
+ map[Lock+NumLock+Shift] = Level6;
+ map[Lock+NumLock+LevelThree] = Level7;
+ map[Lock+NumLock+LevelThree+Shift] = Level8;
+
+ map[Lock+NumLock+LevelFive] = Level2;
+ map[Lock+NumLock+LevelFive+Shift] = Level1;
+ map[Lock+NumLock+LevelFive+LevelThree] = Level4;
+ map[Lock+NumLock+LevelFive+LevelThree+Shift] = Level3;
+
+ preserve[LevelFive+Shift] = Shift;
+ preserve[NumLock+Shift] = Shift;
+
+ level_name[Level1] = "Base";
+ level_name[Level2] = "Shift";
+ level_name[Level3] = "Alt Base";
+ level_name[Level4] = "Shift Alt";
+ level_name[Level5] = "X";
+ level_name[Level6] = "X Shift";
+ level_name[Level7] = "X Alt Base";
+ level_name[Level8] = "X Shift Alt";
+ };
type "EIGHT_LEVEL_SEMIALPHABETIC" {
modifiers = Shift+Lock+LevelThree+LevelFive;
commit 1d63173885b09f197b3e10fcd010430ba37600ab
Author: Sergey Udaltsov <sergey.udalt...@gmail.com>
Date: Tue Jan 26 20:50:05 2016 +0000
Release 2.17
diff --git a/NEWS b/NEWS
index 65bc26a..fe4495d 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,5 @@
+2.17 12 bugs fixed
+ Translations updated
2.16 10 bugs fixed
Translations updated
2.15 7 bugs fixed
diff --git a/configure.ac b/configure.ac
index b78c3b4..3c42ad0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT(xkeyboard-config, 2.16.99)
+AC_INIT(xkeyboard-config, 2.17)
AC_CONFIG_SRCDIR(rules/base.xml.in)
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
commit d08c24bcaf82afcad6eff6fabe357d82f958b564
Author: Sergey Udaltsov <sergey.udalt...@gmail.com>
Date: Tue Jan 26 20:43:04 2016 +0000
Translations updated before release
diff --git a/po/bg.po b/po/bg.po
index 1c8fe76..03e3d23 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -1,11 +1,11 @@
# Bulgarian translation of xkeyboard-config.
# Copyright (C) 2002, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# Copyright (C) 2009, 2010, 2011, 2012, 2013 Free Software Foundation, Inc.
-# Copyright (C) 2014 Free Software Foundation, Inc.
+# Copyright (C) 2014, 2016 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.
# Alexander Shopov <a...@kambanaria.org>, 2009, 2010, 2011, 2012, 2013.
-# Alexander Shopov <a...@kambanaria.org>, 2014.
+# Alexander Shopov <a...@kambanaria.org>, 2014, 2016.
# Damyan Ivanov <dam+gn...@ktnx.net>, 2010.
#
#
@@ -51,10 +51,10 @@
# Предпочита се дълго тире „—“ пред скоби „()“.
msgid ""
msgstr ""
-"Project-Id-Version: xkeyboard-config-2.12.99\n"
+"Project-Id-Version: xkeyboard-config-2.16.99\n"
"Report-Msgid-Bugs-To: s...@users.sourceforge.net\n"
-"POT-Creation-Date: 2014-09-18 23:46+0100\n"
-"PO-Revision-Date: 2014-09-22 22:39+0300\n"
+"POT-Creation-Date: 2016-01-14 01:18+0000\n"
+"PO-Revision-Date: 2016-01-14 18:52+0200\n"
"Last-Translator: Alexander Shopov <a...@kambanaria.org>\n"
"Language-Team: Bulgarian <d...@ludost.net>\n"
"Language: bg\n"
@@ -799,3233 +799,3322 @@ msgstr "Creative Desktop Wireless 7000 — безжична"
msgid "Htc Dream phone"
msgstr "Телефон HTC Dream"
+#: ../rules/base.xml.in.h:185
+msgid "Truly Ergonomic Computer Keyboard Model 227 (Wide Alt keys)"
+msgstr "Truly Ergonomic Computer Keyboard Model 227 — ергономична, широк Alt"
+
+#: ../rules/base.xml.in.h:186
+msgid "Truly Ergonomic Computer Keyboard Model 229 (Standard sized Alt keys,
additional Super and Menu key)"
+msgstr "Truly Ergonomic Computer Keyboard Model 229 — ергономична, нормален
Alt, допълнителни Super и Menu"
+
#. Keyboard indicator for English layouts
-#: ../rules/base.xml.in.h:186 ../rules/base.extras.xml.in.h:46
+#: ../rules/base.xml.in.h:188 ../rules/base.extras.xml.in.h:48
msgid "en"
msgstr "Анг"
-#: ../rules/base.xml.in.h:187 ../rules/base.extras.xml.in.h:47
+#: ../rules/base.xml.in.h:189 ../rules/base.extras.xml.in.h:49
msgid "English (US)"
msgstr "английска — американска"
#. Keyboard indicator for Cherokee layouts
-#: ../rules/base.xml.in.h:189
+#: ../rules/base.xml.in.h:191
msgid "chr"
msgstr "Чрк"
-#: ../rules/base.xml.in.h:190
+#: ../rules/base.xml.in.h:192
msgid "Cherokee"
msgstr "черокска"
-#: ../rules/base.xml.in.h:191
+#: ../rules/base.xml.in.h:193
msgid "English (US, with euro on 5)"
msgstr "английска — американска, c „€“ при 5"
-#: ../rules/base.xml.in.h:192
+#: ../rules/base.xml.in.h:194
msgid "English (US, international with dead keys)"
msgstr "английска — американска, международна, с „мъртви“ клавиши"
-#: ../rules/base.xml.in.h:193
+#: ../rules/base.xml.in.h:195
msgid "English (US, alternative international)"
msgstr "английска — американска, международна, алтернативна"
-#: ../rules/base.xml.in.h:194
+#: ../rules/base.xml.in.h:196
msgid "English (Colemak)"
msgstr "английска — Коулмак"
-#: ../rules/base.xml.in.h:195
+#: ../rules/base.xml.in.h:197
msgid "English (Dvorak)"
msgstr "английска — Дворак"
-#: ../rules/base.xml.in.h:196
+#: ../rules/base.xml.in.h:198
msgid "English (Dvorak, international with dead keys)"
msgstr "английска — Дворак, международна, с „мъртви“ клавиши"
# FIXME алтернативна да е след международна
-#: ../rules/base.xml.in.h:197
+#: ../rules/base.xml.in.h:199
msgid "English (Dvorak alternative international no dead keys)"
msgstr "английска — Дворак, международна, алтернативна, без „мъртви“ клавиши"
-#: ../rules/base.xml.in.h:198
+#: ../rules/base.xml.in.h:200
msgid "English (left handed Dvorak)"
msgstr "английска — Дворак за левичари"
-#: ../rules/base.xml.in.h:199
+#: ../rules/base.xml.in.h:201
msgid "English (right handed Dvorak)"
msgstr "английска — Дворак за десничари"
-#: ../rules/base.xml.in.h:200
+#: ../rules/base.xml.in.h:202
msgid "English (classic Dvorak)"
msgstr "английска — класически Дворак"
-#: ../rules/base.xml.in.h:201
-msgid "English (programmer Dvorak)"
+#: ../rules/base.xml.in.h:203
+msgid "English (Programmer Dvorak)"
msgstr "английска — Дворак за програмисти"
#. Keyboard indicator for Russian layouts
-#: ../rules/base.xml.in.h:203 ../rules/base.extras.xml.in.h:69
+#: ../rules/base.xml.in.h:205 ../rules/base.extras.xml.in.h:71
msgid "ru"
msgstr "Рск"
-#: ../rules/base.xml.in.h:204
+#: ../rules/base.xml.in.h:206
msgid "Russian (US, phonetic)"
msgstr "руска — американска, фонетична"
-#: ../rules/base.xml.in.h:205
+#: ../rules/base.xml.in.h:207
msgid "English (Macintosh)"
msgstr "английска — за Макинтош"
-#: ../rules/base.xml.in.h:206
+#: ../rules/base.xml.in.h:208
msgid "English (international AltGr dead keys)"
msgstr "английска — международна, с „мъртви“ клавиши чрез AltGr"
-#: ../rules/base.xml.in.h:207
+#: ../rules/base.xml.in.h:209
msgid "English (the divide/multiply keys toggle the layout)"
msgstr "английска — „*“ и „/“ сменят подредбата"
-#: ../rules/base.xml.in.h:208
+#: ../rules/base.xml.in.h:210
msgid "Serbo-Croatian (US)"
msgstr "сърбохърватска — американска"
-#: ../rules/base.xml.in.h:209
+#: ../rules/base.xml.in.h:211
msgid "English (Workman)"
msgstr "английска — Уъркман"
-#: ../rules/base.xml.in.h:210
+#: ../rules/base.xml.in.h:212
msgid "English (Workman, international with dead keys)"
msgstr "английска — Уъркман, международна, с „мъртви“ клавиши"
#. Keyboard indicator for Persian layouts
-#: ../rules/base.xml.in.h:212 ../rules/base.extras.xml.in.h:28
+#: ../rules/base.xml.in.h:214 ../rules/base.extras.xml.in.h:30
msgid "fa"
msgstr "Прс"
-#: ../rules/base.xml.in.h:213
+#: ../rules/base.xml.in.h:215
msgid "Afghani"
msgstr "афганистанска"
#. Keyboard indicator for Pashto layouts
-#: ../rules/base.xml.in.h:215
+#: ../rules/base.xml.in.h:217
msgid "ps"
msgstr "Пщн"
-#: ../rules/base.xml.in.h:216
+#: ../rules/base.xml.in.h:218
msgid "Pashto"
msgstr "пащунска"
#. Keyboard indicator for Uzbek layouts
-#: ../rules/base.xml.in.h:218
+#: ../rules/base.xml.in.h:220
msgid "uz"
msgstr "Узб"
-#: ../rules/base.xml.in.h:219
+#: ../rules/base.xml.in.h:221
msgid "Uzbek (Afghanistan)"
msgstr "узбекска — афганистанска"
-#: ../rules/base.xml.in.h:220
+#: ../rules/base.xml.in.h:222
msgid "Pashto (Afghanistan, OLPC)"
msgstr "пащунска — афганистанска, OLPC"
-#: ../rules/base.xml.in.h:221
+#: ../rules/base.xml.in.h:223
msgid "Persian (Afghanistan, Dari OLPC)"
msgstr "персийска — афганистанска, дарийски OLPC"
-#: ../rules/base.xml.in.h:222
+#: ../rules/base.xml.in.h:224
msgid "Uzbek (Afghanistan, OLPC)"
msgstr "узбекска — афганистанска, OLPC"
#. Keyboard indicator for Arabic layouts
-#: ../rules/base.xml.in.h:224 ../rules/base.extras.xml.in.h:80
+#: ../rules/base.xml.in.h:226 ../rules/base.extras.xml.in.h:82
msgid "ar"
msgstr "Арб"
-#: ../rules/base.xml.in.h:225 ../rules/base.extras.xml.in.h:81
+#: ../rules/base.xml.in.h:227 ../rules/base.extras.xml.in.h:83
msgid "Arabic"
msgstr "арабска"
-#: ../rules/base.xml.in.h:226
+#: ../rules/base.xml.in.h:228
msgid "Arabic (azerty)"
msgstr "арабска — azerty"
-#: ../rules/base.xml.in.h:227
+#: ../rules/base.xml.in.h:229
msgid "Arabic (azerty/digits)"
msgstr "арабска — azerty/цифри"
-#: ../rules/base.xml.in.h:228
+#: ../rules/base.xml.in.h:230
msgid "Arabic (digits)"
msgstr "арабска — цифри"
-#: ../rules/base.xml.in.h:229
+#: ../rules/base.xml.in.h:231
msgid "Arabic (qwerty)"
msgstr "арабска — qwerty"
-#: ../rules/base.xml.in.h:230
+#: ../rules/base.xml.in.h:232
msgid "Arabic (qwerty/digits)"
msgstr "арабска — querty/цифри"
-#: ../rules/base.xml.in.h:231
+#: ../rules/base.xml.in.h:233
msgid "Arabic (Buckwalter)"
msgstr "арабска — транслитерация по Бъкуолтър"
+#: ../rules/base.xml.in.h:234
+msgid "Arabic (Macintosh)"
+msgstr "арабска — за Макинтош"
+
#. Keyboard indicator for Albanian layouts
-#: ../rules/base.xml.in.h:233
+#: ../rules/base.xml.in.h:236
msgid "sq"
msgstr "Алб"
-#: ../rules/base.xml.in.h:234
+#: ../rules/base.xml.in.h:237
msgid "Albanian"
msgstr "албанска"
-#: ../rules/base.xml.in.h:235
+#: ../rules/base.xml.in.h:238
msgid "Albanian (Plisi D1)"
msgstr "албанска — плиси D1"
#. Keyboard indicator for Armenian layouts
-#: ../rules/base.xml.in.h:237 ../rules/base.extras.xml.in.h:74
+#: ../rules/base.xml.in.h:240 ../rules/base.extras.xml.in.h:76
msgid "hy"
msgstr "Арм"
-#: ../rules/base.xml.in.h:238 ../rules/base.extras.xml.in.h:75
+#: ../rules/base.xml.in.h:241 ../rules/base.extras.xml.in.h:77
msgid "Armenian"
msgstr "арменска"
-#: ../rules/base.xml.in.h:239
+#: ../rules/base.xml.in.h:242
msgid "Armenian (phonetic)"
msgstr "арменска — фонетична"
-#: ../rules/base.xml.in.h:240
+#: ../rules/base.xml.in.h:243
msgid "Armenian (alternative phonetic)"
msgstr "арменска — фонетична, алтернативна"
-#: ../rules/base.xml.in.h:241
+#: ../rules/base.xml.in.h:244
msgid "Armenian (eastern)"
msgstr "арменска — източна"
-#: ../rules/base.xml.in.h:242
+#: ../rules/base.xml.in.h:245
msgid "Armenian (western)"
msgstr "арменска — западна"
-#: ../rules/base.xml.in.h:243
+#: ../rules/base.xml.in.h:246
msgid "Armenian (alternative eastern)"
msgstr "арменска — източна, алтернативна"
#. Keyboard indicator for German layouts
-#: ../rules/base.xml.in.h:245 ../rules/base.extras.xml.in.h:22
+#: ../rules/base.xml.in.h:248 ../rules/base.extras.xml.in.h:22
msgid "de"
msgstr "Нмс"
-#: ../rules/base.xml.in.h:246
+#: ../rules/base.xml.in.h:249
msgid "German (Austria)"
msgstr "немска — австрийска"
-#: ../rules/base.xml.in.h:247
+#: ../rules/base.xml.in.h:250
msgid "German (Austria, eliminate dead keys)"
msgstr "немска, австрийска, без „мъртви“ клавиши"
-#: ../rules/base.xml.in.h:248
+#: ../rules/base.xml.in.h:251
msgid "German (Austria, Sun dead keys)"
msgstr "немска — австрийска, с „мъртви“ клавиши на Sun"
-#: ../rules/base.xml.in.h:249
+#: ../rules/base.xml.in.h:252
msgid "German (Austria, Macintosh)"
msgstr "немска — австрийска, за Макинтош"
#. Keyboard indicator for Azerbaijani layouts
-#: ../rules/base.xml.in.h:251
+#: ../rules/base.xml.in.h:254
msgid "az"
msgstr "Азр"
-#: ../rules/base.xml.in.h:252
+#: ../rules/base.xml.in.h:255
msgid "Azerbaijani"
msgstr "азърбейджанска"
-#: ../rules/base.xml.in.h:253
+#: ../rules/base.xml.in.h:256
msgid "Azerbaijani (Cyrillic)"
msgstr "азърбейджанска — кирилица"
#. Keyboard indicator for Belarusian layouts
-#: ../rules/base.xml.in.h:255
+#: ../rules/base.xml.in.h:258
msgid "by"
msgstr "Блр"
-#: ../rules/base.xml.in.h:256
+#: ../rules/base.xml.in.h:259
msgid "Belarusian"
msgstr "беларуска"
-#: ../rules/base.xml.in.h:257
+#: ../rules/base.xml.in.h:260
msgid "Belarusian (legacy)"
msgstr "беларуска — остаряла"
-#: ../rules/base.xml.in.h:258
+#: ../rules/base.xml.in.h:261
msgid "Belarusian (Latin)"
msgstr "беларуска — латиница"
#. Keyboard indicator for Belgian layouts
-#: ../rules/base.xml.in.h:260 ../rules/base.extras.xml.in.h:83
+#: ../rules/base.xml.in.h:263 ../rules/base.extras.xml.in.h:85
msgid "be"
msgstr "Бел"
-#: ../rules/base.xml.in.h:261 ../rules/base.extras.xml.in.h:84
+#: ../rules/base.xml.in.h:264 ../rules/base.extras.xml.in.h:86
msgid "Belgian"
msgstr "белгийска"
-#: ../rules/base.xml.in.h:262
+#: ../rules/base.xml.in.h:265
msgid "Belgian (alternative)"
msgstr "белгийска — алтернативна"
-#: ../rules/base.xml.in.h:263
+#: ../rules/base.xml.in.h:266
msgid "Belgian (alternative, Latin-9 only)"
msgstr "белгийска — алтернативна, само латиница по Latin-9"
-#: ../rules/base.xml.in.h:264
+#: ../rules/base.xml.in.h:267
msgid "Belgian (alternative, Sun dead keys)"
msgstr "белгийска — алтернативна, с „мъртви“ клавиши на Sun"
-#: ../rules/base.xml.in.h:265
+#: ../rules/base.xml.in.h:268
msgid "Belgian (ISO alternate)"
msgstr "белгийска — алтернативна по ISO"
-#: ../rules/base.xml.in.h:266
+#: ../rules/base.xml.in.h:269
msgid "Belgian (eliminate dead keys)"
msgstr "белгийска — без „мъртви“ клавиши"
-#: ../rules/base.xml.in.h:267
+#: ../rules/base.xml.in.h:270
msgid "Belgian (Sun dead keys)"
msgstr "белгийска — с „мъртви“ клавиши на Sun"
-#: ../rules/base.xml.in.h:268
+#: ../rules/base.xml.in.h:271
msgid "Belgian (Wang model 724 azerty)"
msgstr "белгийска — Wang, модел 724, azerty"
#. Keyboard indicator for Bangla layouts
-#: ../rules/base.xml.in.h:270
+#: ../rules/base.xml.in.h:273
msgid "bn"
msgstr "Бнг"
-#: ../rules/base.xml.in.h:271
+#: ../rules/base.xml.in.h:274
msgid "Bangla"
msgstr "бенгалска"
-#: ../rules/base.xml.in.h:272
+#: ../rules/base.xml.in.h:275
msgid "Bangla (Probhat)"
msgstr "бенгалска — пробхат"
#. Keyboard indicator for Indian layouts
-#: ../rules/base.xml.in.h:274
+#: ../rules/base.xml.in.h:277
msgid "in"
msgstr "Инд"
-#: ../rules/base.xml.in.h:275
+#: ../rules/base.xml.in.h:278
msgid "Indian"
msgstr "индийска"
-#: ../rules/base.xml.in.h:276
+#: ../rules/base.xml.in.h:279
msgid "Bangla (India)"
msgstr "бенгалска — индийска"
-#: ../rules/base.xml.in.h:277
