[Pkg-kbd-commit] r240 - in people/zinoviev/console-setup: Keyboard
debian debian/po
Anton Zinoviev
zinoviev at alioth.debian.org
Tue May 1 20:48:41 UTC 2007
Author: zinoviev
Date: 2007-05-01 20:48:26 +0000 (Tue, 01 May 2007)
New Revision: 240
Modified:
people/zinoviev/console-setup/Keyboard/ckbcomp
people/zinoviev/console-setup/debian/changelog
people/zinoviev/console-setup/debian/config.proto
people/zinoviev/console-setup/debian/po/bg.po
people/zinoviev/console-setup/debian/po/cs.po
people/zinoviev/console-setup/debian/po/fr.po
people/zinoviev/console-setup/debian/po/templates.pot
people/zinoviev/console-setup/debian/po/tr.po
Log:
console-setup: default layout for Esperanto, ckbcomp: do not ignore {Control,Alt}+special_key combinations
Modified: people/zinoviev/console-setup/Keyboard/ckbcomp
===================================================================
--- people/zinoviev/console-setup/Keyboard/ckbcomp 2007-05-01 12:54:38 UTC (rev 239)
+++ people/zinoviev/console-setup/Keyboard/ckbcomp 2007-05-01 20:48:26 UTC (rev 240)
@@ -2974,6 +2974,7 @@
}
}
+# later in the code we use that the distance is always less than 1000000
sub distance {
my $x = $_[0];
my $y = $_[1];
@@ -3012,9 +3013,9 @@
return $kernelkeysym;
}
} else {
- $kernelkeysym = ($xkeysym =~ /^0x0?100([0-9a-fA-F]{4})/
+ $kernelkeysym = ($xkeysym =~ /^0x0?100([0-9a-fA-F]{4})$/
? $1
- : ($xkeysym =~ /^U([0-9a-fA-F]+)/
+ : ($xkeysym =~ /^U([0-9a-fA-F]+)$/
? $1
: undef));
}
@@ -3135,21 +3136,34 @@
}
next if ($real_level < 0);
my $xkeysym = $symbols_table{$key}[$real_group][$real_level];
+ my $is_special = ($xkeysym !~ /^U[0-9a-fA-F]+$/
+ && defined $xkbsym_table{$xkeysym}
+ && ($xkbsym_table{$xkeysym}
+ !~ /^[0-9a-fA-F]{4}$/));
my $kernelkeysym = x_to_kernelsym ($xkeysym);
$vector[$coord] = $kernelkeysym;
my $ascii = x_to_ascii ($xkeysym);
- next unless (defined $ascii);
+ next unless (defined $ascii or $is_special);
for my $approximated_group (0 .. 3) {
for my $approximated_level (0 .. 3) {
my $approximated_coord = ($approximated_level
+ ($approximated_group << 4));
my $distance = distance ($approximated_coord, $coord);
- approximate (($approximated_coord | 0x08),
- $metasyms[$ascii + 1], $distance);
- approximate (($approximated_coord | 0x04),
- $controlsyms[$ascii + 1], $distance);
- approximate (($approximated_coord | 0x0c),
- $metacontrolsyms[$ascii + 1], $distance);
+ if (defined $ascii) {
+ approximate (($approximated_coord | 0x08),
+ $metasyms[$ascii + 1], $distance);
+ approximate (($approximated_coord | 0x04),
+ $controlsyms[$ascii + 1], $distance);
+ approximate (($approximated_coord | 0x0c),
+ $metacontrolsyms[$ascii + 1], $distance);
+ } elsif ($is_special) {
+ approximate (($approximated_coord | 0x08),
+ $kernelkeysym, $distance);
+ approximate (($approximated_coord | 0x04),
+ $kernelkeysym, $distance);
+ approximate (($approximated_coord | 0x0c),
+ $kernelkeysym, $distance);
+ }
}
}
}
Modified: people/zinoviev/console-setup/debian/changelog
===================================================================
--- people/zinoviev/console-setup/debian/changelog 2007-05-01 12:54:38 UTC (rev 239)
+++ people/zinoviev/console-setup/debian/changelog 2007-05-01 20:48:26 UTC (rev 240)
@@ -1,5 +1,6 @@
console-setup (1.16) UNRELEASED; urgency=low
+ * Update ckbconf with the most recent list of xkeysyms.
* Thanks to Colin Watson and Ubuntu team for the many bugs and
improvements fixed in this release. Patches were provided by Colin
Watson:
@@ -15,9 +16,10 @@
used. Closes: #420827.
- A new option --save-only for setupcon.
- Ship KeyboardNames.pl and kbdnames-maker. Closes: #420914.
- - Fix Esperanto locale check in config.proto. Closes: #420785.
+ - Fix Esperanto locale check in config.proto, closes: #420785. Make
+ 'epo' the default layout for Esperanto.
- The Bosnian layout is 'ba', not 'bs'. Closes: #420787.
- - The Devanagary layout variant is 'deva', not 'dev'. Closes: #420797.
+ - The layout variant is 'deva', not 'dev'. Closes: #420797.
- Do not leave empty default codeset for unsupported locales.
Closes: #420802.
- Use 'jp(latin)' instead of 'us' in the Latin mode of Japanese
@@ -36,12 +38,13 @@
- Add a suggestion for the VBERestore option. Thanks to Dmitry
Semyonov, closes: #402143.
- Document CapsLock working as ShiftLock in Unicode mode.
- * Added Dutch translation. Thanks to Bart Cornelis, closes: #415518.
* Added manual page for setupcon. Thanks to Vassilis Pandis,
closes: #405005.
+ * Added Dutch translation. Thanks to Bart Cornelis, closes: #415518.
+ * Updated Bulgarian translation.
+
+ -- Anton Zinoviev <zinoviev at debian.org> Tue, 1 May 2007 14:04:16 +0300
- -- Anton Zinoviev <zinoviev at debian.org> Tue, 1 May 2007 13:59:29 +0300
-
console-setup (1.15) unstable; urgency=low
* Updated Georgian letters for Fixed16 and Fixed14. Thanks to Vladimer
Modified: people/zinoviev/console-setup/debian/config.proto
===================================================================
--- people/zinoviev/console-setup/debian/config.proto 2007-05-01 12:54:38 UTC (rev 239)
+++ people/zinoviev/console-setup/debian/config.proto 2007-05-01 20:48:26 UTC (rev 240)
@@ -862,6 +862,9 @@
el_*)
default_layout=gr # Greece
;;
+ eo|eo.*|eo_*|eo\@*)
+ default_layout=epo # Esperanto
+ ;;
fr_*)
default_layout=fr # France
layout_priority=critical
@@ -1385,9 +1388,13 @@
db_input high console-setup/toggle || true
db_input medium console-setup/switch || true
fi
- if [ "$layout" = us -a "$variant" = '' ]; then
- # basic US keyboard doesn't use AltGr.
- db_default console-setup/altgr 'No AltGr key'
+ if [ ! -f $CONFIGFILE -a "$layout" = us ]; then
+ if [ "$variant" = '' ]; then
+ # basic US keyboard doesn't use AltGr.
+ db_default console-setup/altgr 'No AltGr key'
+ else
+ db_default console-setup/altgr 'Right Alt'
+ fi
fi
db_input medium console-setup/altgr || true
db_input medium console-setup/compose || true
Modified: people/zinoviev/console-setup/debian/po/bg.po
===================================================================
--- people/zinoviev/console-setup/debian/po/bg.po 2007-05-01 12:54:38 UTC (rev 239)
+++ people/zinoviev/console-setup/debian/po/bg.po 2007-05-01 20:48:26 UTC (rev 240)
@@ -7,8 +7,8 @@
msgstr ""
"Project-Id-Version: console-setup\n"
"Report-Msgid-Bugs-To: pkg-kbd-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2006-11-13 19:48+0200\n"
-"PO-Revision-Date: 2006-11-13 21:22+0200\n"
+"POT-Creation-Date: 2007-05-01 14:01+0300\n"
+"PO-Revision-Date: 2007-05-01 14:03+0300\n"
"Last-Translator: Anton Zinoviev <zinoviev at debian.org>\n"
"Language-Team: BULGARIAN <dict at fsa-bg.org>\n"
"MIME-Version: 1.0\n"
@@ -479,19 +479,16 @@
#. Type: select
#. Description
#: ../console-setup.templates:11002
-msgid "Method for toggling between Latin and non-Latin mode:"
-msgstr "Метод за превключване между режими „латиница“ и „нелатински букви“:"
+msgid "Method for toggling between national and Latin mode:"
+msgstr "Метод за превключване между режими „латиница“ и „национални букви“:"
#. Type: select
#. Description
#: ../console-setup.templates:11002
msgid ""
-"Since your keyboard is a non-Latin one, you will need a way to toggle "
-"between the Latin and the non-Latin mode. Several options are available."
-msgstr ""
-"Тъй като вашата клавиатурна подредба не е латинска, ще ви трябва начин да "
-"превключвате между режим „латиница“ и режим „нелатински букви“. Има редица "
-"възможности."
+"You will need a way to toggle the keyboard between the national layout and "
+"the standard Latin layout. Several options are available."
+msgstr "При вашата клавиатурна подредба е необходим начин за превключване между режим „латиница“ и режим „национални букви“. Има редица възможности."
#. Type: select
#. Description
@@ -533,27 +530,20 @@
#. Type: select
#. Description
#: ../console-setup.templates:12002
-msgid "Method for temporarily toggle between Latin and non-Latin input:"
-msgstr "Метод за временна смяна между режими „латиница“ и „нелатински букви“:"
+msgid "Method for temporarily toggle between national and Latin input:"
+msgstr "Метод за временна смяна между режими „латиница“ и „национални букви“:"
#. Type: select
#. Description
#: ../console-setup.templates:12002
msgid ""
-"Sometimes the keyboard is in non-Latin mode and you want to type only few "
+"Sometimes the keyboard is in national mode and you want to type only few "
"Latin letters. In this case it may be desirable to have a key for temporary "
-"switching between non-Latin and Latin letters. While this key is pressed in "
-"non-Latin mode the keyboard types Latin letters and in reverse, when the "
+"switching between national and Latin symbols. While this key is pressed in "
+"national mode the keyboard types Latin letters and in reverse, when the "
"keyboard is in Latin mode and you are pressing this key the keyboard will "
-"type non-Latin letters."
-msgstr ""
-"Понякога клавиатурата се намира в режим за нелатински знаци и искате да "
-"въведете само няколко латински букви. В този случай може би е желателно да "
-"имате клавиш, с който да може да се преминава временно между режим "
-"„латиница“ и режим с нелатински букви. Докато този клавиш е натиснат в "
-"режим за нелатински букви, клавиатурата ще генерира латински букви и "
-"обратно, докато той е натиснат в режим „латиница“, клавиатурата ще генерира "
-"нелатински букви."
+"type national letters."
+msgstr "Понякога клавиатурата се намира в режим за национални знаци и искате да въведете само няколко латински букви. В този случай може би е желателно да имате клавиш, с който да може да се преминава временно между режим „латиница“ и режим с национални букви. Докато този клавиш е натиснат в режим за национални букви, клавиатурата ще генерира латински букви и обратно, докато той е натиснат в режим „латиница“, клавиатурата ще генерира национални букви."
#. Type: select
#. Description
Modified: people/zinoviev/console-setup/debian/po/cs.po
===================================================================
--- people/zinoviev/console-setup/debian/po/cs.po 2007-05-01 12:54:38 UTC (rev 239)
+++ people/zinoviev/console-setup/debian/po/cs.po 2007-05-01 20:48:26 UTC (rev 240)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: console-setup\n"
"Report-Msgid-Bugs-To: pkg-kbd-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2006-11-13 19:48+0200\n"
+"POT-Creation-Date: 2007-05-01 14:01+0300\n"
"PO-Revision-Date: 2007-01-27 12:12+0100\n"
"Last-Translator: Miroslav Kure <kurem at debian.cz>\n"
"Language-Team: Czech <debian-l10n-czech at lists.debian.org>\n"
@@ -476,15 +476,17 @@
#. Type: select
#. Description
#: ../console-setup.templates:11002
-msgid "Method for toggling between Latin and non-Latin mode:"
+#, fuzzy
+msgid "Method for toggling between national and Latin mode:"
msgstr "Způsob přepínání mezi vstupem latinky a jiných abeced:"
#. Type: select
#. Description
#: ../console-setup.templates:11002
+#, fuzzy
msgid ""
-"Since your keyboard is a non-Latin one, you will need a way to toggle "
-"between the Latin and the non-Latin mode. Several options are available."
+"You will need a way to toggle the keyboard between the national layout and "
+"the standard Latin layout. Several options are available."
msgstr ""
"Protože vaše klávesnice nepoužívá latinku, potřebujete způsob, kterým se "
"budete přepínat mezi režimem latinky a vaším zvoleným. K dispozici je "
@@ -528,19 +530,21 @@
#. Type: select
#. Description
#: ../console-setup.templates:12002
-msgid "Method for temporarily toggle between Latin and non-Latin input:"
+#, fuzzy
+msgid "Method for temporarily toggle between national and Latin input:"
msgstr "Způsob pro dočasné přepnutí mezi vstupem latinky a jiné abecedy:"
#. Type: select
#. Description
#: ../console-setup.templates:12002
+#, fuzzy
msgid ""
-"Sometimes the keyboard is in non-Latin mode and you want to type only few "
+"Sometimes the keyboard is in national mode and you want to type only few "
"Latin letters. In this case it may be desirable to have a key for temporary "
-"switching between non-Latin and Latin letters. While this key is pressed in "
-"non-Latin mode the keyboard types Latin letters and in reverse, when the "
+"switching between national and Latin symbols. While this key is pressed in "
+"national mode the keyboard types Latin letters and in reverse, when the "
"keyboard is in Latin mode and you are pressing this key the keyboard will "
-"type non-Latin letters."
+"type national letters."
msgstr ""
"Občas máte klávesnici v režimu vkládání nelatinkových písmen a potřebujete "
"napsat pouze několik písmen z latinky. V takových případech je užitečné mít "
Modified: people/zinoviev/console-setup/debian/po/fr.po
===================================================================
--- people/zinoviev/console-setup/debian/po/fr.po 2007-05-01 12:54:38 UTC (rev 239)
+++ people/zinoviev/console-setup/debian/po/fr.po 2007-05-01 20:48:26 UTC (rev 240)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: console-setup\n"
"Report-Msgid-Bugs-To: pkg-kbd-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2006-11-13 19:48+0200\n"
+"POT-Creation-Date: 2007-05-01 14:01+0300\n"
"PO-Revision-Date: 2006-11-13 21:24+0200\n"
"Last-Translator: Jean-Luc Coulon (f5ibh) <jean-luc.coulon at wanadoo.fr>\n"
"Language-Team: French <debian-l10n-french at lists.debian.org>\n"
@@ -488,15 +488,17 @@
#. Type: select
#. Description
#: ../console-setup.templates:11002
-msgid "Method for toggling between Latin and non-Latin mode:"
+#, fuzzy
+msgid "Method for toggling between national and Latin mode:"
msgstr "Méthode de basculement entre les modes latin et non latin :"
#. Type: select
#. Description
#: ../console-setup.templates:11002
+#, fuzzy
msgid ""
-"Since your keyboard is a non-Latin one, you will need a way to toggle "
-"between the Latin and the non-Latin mode. Several options are available."
+"You will need a way to toggle the keyboard between the national layout and "
+"the standard Latin layout. Several options are available."
msgstr ""
"Puisque votre clavier est non latin, il vous faudra un moyen pour basculer "
"entre les modes latin et non latin. Plusieurs options sont disponibles."
@@ -544,7 +546,8 @@
#. Type: select
#. Description
#: ../console-setup.templates:12002
-msgid "Method for temporarily toggle between Latin and non-Latin input:"
+#, fuzzy
+msgid "Method for temporarily toggle between national and Latin input:"
msgstr ""
"Méthode de basculement temporaire entre les entrées de caractères latins et "
"non latins :"
@@ -552,13 +555,14 @@
#. Type: select
#. Description
#: ../console-setup.templates:12002
+#, fuzzy
msgid ""
-"Sometimes the keyboard is in non-Latin mode and you want to type only few "
+"Sometimes the keyboard is in national mode and you want to type only few "
"Latin letters. In this case it may be desirable to have a key for temporary "
-"switching between non-Latin and Latin letters. While this key is pressed in "
-"non-Latin mode the keyboard types Latin letters and in reverse, when the "
+"switching between national and Latin symbols. While this key is pressed in "
+"national mode the keyboard types Latin letters and in reverse, when the "
"keyboard is in Latin mode and you are pressing this key the keyboard will "
-"type non-Latin letters."
+"type national letters."
msgstr ""
"Parfois, le clavier est dans un mode non latin et vous désirez entrer "
"quelques caractères latins. Dans ce cas, il peut être souhaitable d'avoir "
Modified: people/zinoviev/console-setup/debian/po/templates.pot
===================================================================
--- people/zinoviev/console-setup/debian/po/templates.pot 2007-05-01 12:54:38 UTC (rev 239)
+++ people/zinoviev/console-setup/debian/po/templates.pot 2007-05-01 20:48:26 UTC (rev 240)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: pkg-kbd-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2006-11-13 19:48+0200\n"
+"POT-Creation-Date: 2007-05-01 14:01+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -443,15 +443,15 @@
#. Type: select
#. Description
#: ../console-setup.templates:11002
-msgid "Method for toggling between Latin and non-Latin mode:"
+msgid "Method for toggling between national and Latin mode:"
msgstr ""
#. Type: select
#. Description
#: ../console-setup.templates:11002
msgid ""
-"Since your keyboard is a non-Latin one, you will need a way to toggle "
-"between the Latin and the non-Latin mode. Several options are available."
+"You will need a way to toggle the keyboard between the national layout and "
+"the standard Latin layout. Several options are available."
msgstr ""
#. Type: select
@@ -488,19 +488,19 @@
#. Type: select
#. Description
#: ../console-setup.templates:12002
-msgid "Method for temporarily toggle between Latin and non-Latin input:"
+msgid "Method for temporarily toggle between national and Latin input:"
msgstr ""
#. Type: select
#. Description
#: ../console-setup.templates:12002
msgid ""
-"Sometimes the keyboard is in non-Latin mode and you want to type only few "
+"Sometimes the keyboard is in national mode and you want to type only few "
"Latin letters. In this case it may be desirable to have a key for temporary "
-"switching between non-Latin and Latin letters. While this key is pressed in "
-"non-Latin mode the keyboard types Latin letters and in reverse, when the "
+"switching between national and Latin symbols. While this key is pressed in "
+"national mode the keyboard types Latin letters and in reverse, when the "
"keyboard is in Latin mode and you are pressing this key the keyboard will "
-"type non-Latin letters."
+"type national letters."
msgstr ""
#. Type: select
Modified: people/zinoviev/console-setup/debian/po/tr.po
===================================================================
--- people/zinoviev/console-setup/debian/po/tr.po 2007-05-01 12:54:38 UTC (rev 239)
+++ people/zinoviev/console-setup/debian/po/tr.po 2007-05-01 20:48:26 UTC (rev 240)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: console-setup\n"
"Report-Msgid-Bugs-To: pkg-kbd-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2006-11-13 19:48+0200\n"
+"POT-Creation-Date: 2007-05-01 14:01+0300\n"
"PO-Revision-Date: 2006-01-14 16:27+0200\n"
"Last-Translator: Recai Oktaş <roktas at debian.org>\n"
"Language-Team: Debian L10n Turkish <debian-l10n-turkish at lists.debian.org>\n"
@@ -469,15 +469,16 @@
#. Description
#: ../console-setup.templates:11002
#, fuzzy
-msgid "Method for toggling between Latin and non-Latin mode:"
+msgid "Method for toggling between national and Latin mode:"
msgstr "Latin ve Latin olmayan kipler arasında geçiş"
#. Type: select
#. Description
#: ../console-setup.templates:11002
+#, fuzzy
msgid ""
-"Since your keyboard is a non-Latin one, you will need a way to toggle "
-"between the Latin and the non-Latin mode. Several options are available."
+"You will need a way to toggle the keyboard between the national layout and "
+"the standard Latin layout. Several options are available."
msgstr ""
"Latin olmayan bir klavye kullandığınızdan Latin ve Latin olmayan kipler "
"arasında geçiş yapmak için bir yola ihtiyaç duyacaksınız. Buna yönelik çok "
@@ -524,19 +525,20 @@
#. Description
#: ../console-setup.templates:12002
#, fuzzy
-msgid "Method for temporarily toggle between Latin and non-Latin input:"
+msgid "Method for temporarily toggle between national and Latin input:"
msgstr "Latin ve Latin olmayan kipler arasında geçici geçiş"
#. Type: select
#. Description
#: ../console-setup.templates:12002
+#, fuzzy
msgid ""
-"Sometimes the keyboard is in non-Latin mode and you want to type only few "
+"Sometimes the keyboard is in national mode and you want to type only few "
"Latin letters. In this case it may be desirable to have a key for temporary "
-"switching between non-Latin and Latin letters. While this key is pressed in "
-"non-Latin mode the keyboard types Latin letters and in reverse, when the "
+"switching between national and Latin symbols. While this key is pressed in "
+"national mode the keyboard types Latin letters and in reverse, when the "
"keyboard is in Latin mode and you are pressing this key the keyboard will "
-"type non-Latin letters."
+"type national letters."
msgstr ""
"Bazı zamanlar, klavye Latin olmayan kipteyken, sadece birkaç Latin harfi "
"girmek isteyebilirsiniz. Bu tür durumlarda geçici olarak Latin ve Latin "
More information about the Pkg-kbd-commit
mailing list