ChangeLog | 129 +
debian/changelog | 14
docs/README.enhancing | 4
geometry/dell | 359 +++++
intltool-extract.in | 4
intltool-merge.in | 24
intltool-update.in | 110 +
keycodes/evdev | 43
keycodes/macintosh | 16
keycodes/xfree86 | 8
po/ChangeLog | 88 -
po/el.po | 2229 ++++++++++++++++++++++++----------
po/fi.po | 1801 ++++++++++++++++++---------
po/nl.po | 2143 ++++++++++++++++++++++++--------
po/sk.po | 2684 +++++++++++++++++++++++++----------------
po/sv.po | 1512 +++++++++++------------
po/tr.po | 1787 +++++++++++++++------------
po/uk.po | 1768 +++++++++++++++++----------
rules/base | 44
rules/base.lists.part | 17
rules/base.lst | 27
rules/base.m_g.part | 3
rules/base.m_k.part | 1
rules/base.m_s.part | 15
rules/base.ml1_s.part | 1
rules/base.ml_g.part | 1
rules/base.ml_s.part | 3
rules/base.mlv_s.part | 3
rules/base.xml.in | 147 +-
rules/compat/variantRename.lst | 2
symbols/Makefile.am | 6
symbols/Makefile.in | 6
symbols/ara | 29
symbols/br | 16
symbols/cd | 4
symbols/digital_vndr/pc | 4
symbols/et | 6
symbols/gr | 6
symbols/group | 33
symbols/inet | 726 +++--------
symbols/it | 25
symbols/jp | 22
symbols/la | 6
symbols/level3 | 5
symbols/pc | 11
symbols/ro | 6
symbols/ru | 13
symbols/us | 194 ++
types/caps | 4
types/pc | 40
50 files changed, 10469 insertions(+), 5680 deletions(-)
New commits:
commit c88142ea45168fef4190c3bb95b49582ecfe5180
Author: Mohammed Adnene Trojette <[EMAIL PROTECTED]>
Date: Fri Sep 14 19:15:11 2007 +0200
releasing version 1.0~cvs.20070914-1
diff --git a/ChangeLog b/ChangeLog
index cfd027d..9e8c5c4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,130 @@
+2007-09-05 Sergey Udaltsov
+
+ * symbols/inet, geometry/dell, rules/base.m_g.part,
+ rules/base.lists.part: adding dell precision m65,
+ https://bugs.freedesktop.org/show_bug.cgi?id=7992
+ * rules/base.m_g.part: fixed rules for the kinesis keyboard,
+ https://bugs.freedesktop.org/show_bug.cgi?id=7991
+
+2007-09-04 Sergey Udaltsov
+
+ * symbols/it, rules/base.xml.in: added strange one, it(geo),
+ contributed by Vladimir Sichinava
+
+2007-09-02 Sergey Udaltsov
+
+ * keycodes/evdev, symbols/inet: more evdev keycodes,
+ https://bugs.freedesktop.org/show_bug.cgi?id=12227
+ https://bugs.freedesktop.org/show_bug.cgi?id=12228
+
+2007-08-29 Sergey Udaltsov
+
+ * keycodes/evdev: updated evdev keycodes,
+ https://bugs.freedesktop.org/show_bug.cgi?id=12202
+ * keycodes/xfree86, symbols/inet, symbols/pc: display switch &
+ backlight control, https://bugs.freedesktop.org/show_bug.cgi?id=12203
+ * keycodes/macintosh, rules/base.m_k.part, rules/base.xml.in: adding
+ macintosh_hhk model,
+ https://bugs.freedesktop.org/show_bug.cgi?id=12091
+
+2007-08-28 Sergey Udaltsov
+
+ * symbols/group, symbols/jp, symbols/la, symbols/level3, symbols/pc,
+ symbols/digital_vndr/pc, types/pc: renaming types, giving more
+ sensible names
+
+2007-08-27 Sergey Udaltsov
+
+ * keycodes/evdev: missing keycodes for evdev:
+ https://bugs.freedesktop.org/show_bug.cgi?id=12167
+
+2007-08-26 Sergey Udaltsov
+
+ * rules/compat/variantRename.lst: fixing dvorak layouts compat rule,
+ https://bugs.freedesktop.org/show_bug.cgi?id=12115
+
+2007-08-24 Sergey Udaltsov
+
+ * symbols/us: fixes typos in us(classmate-intl)
+
+2007-08-22 Sergey Udaltsov
+
+ * rules/base.xml.in, symbols/Makefile.am, symbols/cn: adding Tibetan
+ layouts, https://bugs.freedesktop.org/show_bug.cgi?id=12088
+
+2007-08-20 Sergey Udaltsov
+
+ * symbols/gr: replacing combining keys with dead keys, temporary hack
+ by James Cloos
+
+2007-08-19 Sergey Udaltsov
+
+ * symbols/et: added missing dead "c" key
+
+2007-08-18 Sergey Udaltsov
+
+ * rules/base.lists.part, rules/base.ml_s.part, rules/base.mlv_s.part,
+ rules/base.xml.in, symbols/inet, symbols/us: added classmate model
+ with specific variants,
+ https://bugs.freedesktop.org/show_bug.cgi?id=11955
+
+2007-08-14 Sergey Udaltsov
+
+ * symbols/inet, rules/base.xml.in: added asus_laptop,
+ https://bugs.freedesktop.org/show_bug.cgi?id=11936
+
+2007-08-12 Sergey Udaltsov
+
+ * symbols/ru: fixed ebreve in ru(ch),
+ http://bugs.freedesktop.org/show_bug.cgi?id=11246
+ * rules/base.xml.in: missing Romanian variants added,
+ https://bugs.freedesktop.org/show_bug.cgi?id=11945
+
+2007-08-10 Sergey Udaltsov
+
+ * symbols/br, rules/base.m_g.part, rules/base.ml1_s.part,
+ rules/base.ml_g.part, rules/base.ml_s.part: Adding br(thinkpad),
+ polishing rules a bit,
+ https://bugs.freedesktop.org/show_bug.cgi?id=11908
+
+2007-08-07 Sergey Udaltsov
+
+ * symbols/ara: Patch to Arabic keyboard layout,
+ http://bugs.freedesktop.org/show_bug.cgi?id=11867
+
+2007-08-03 Sergey Udaltsov
+
+ * symbols/us, rules/base.xml.in: added us(altgr-intl), closing
+ http://bugs.freedesktop.org/show_bug.cgi?id=11753
+
+2007-07-30 Sergey Udaltsov
+
+ * symbols/inet, rules/base.lists.part, rules/base.m_s.part,
+ rules/base.xml.in: introduced media_common, some Dell/Logitech symbols
+ are dead, compatibility rules created, Acer kbds consolidated,
+ http://bugs.freedesktop.org/show_bug.cgi?id=11746
+
+2007-07-25 Sergey Udaltsov
+
+ * symbols/inet, rules/base.lists.part, rules/base.m_s.part,
+ rules/base.xml.in: consolidating benq keyboards,
+ https://bugs.freedesktop.org/show_bug.cgi?id=11713
+
+2007-07-24 Sergey Udaltsov
+
+ * symbols/gn, symbols/Makefile.am, rules/base.xml.in: added Guinea,
+ http://bugs.freedesktop.org/show_bug.cgi?id=11702
+
+2007-07-23 Sergey Udaltsov
+
+ * symbols/cd: update Congolese,
+ https://bugs.freedesktop.org/show_bug.cgi?id=5500
+
+2007-07-22 Sergey Udaltsov
+
+ * symbols/inet, rules/base.lists.part, rules/base.xml.in: adding
+ logiex110 model, https://bugs.freedesktop.org/show_bug.cgi?id=11686
+
2007-07-20 Sergey Udaltsov
* symbols/gr: adding pound sign,
@@ -1548,7 +1675,7 @@
2004-09-13 22:39 svu
- * symbols/tj: new local cvs keyword seems to be ok - no more $Id:
ChangeLog,v 1.302 2007-07-20 23:30:14 svu Exp $
+ * symbols/tj: new local cvs keyword seems to be ok - no more $Id:
ChangeLog,v 1.329 2007-09-05 23:10:13 svu Exp $
2004-09-13 22:38 svu
diff --git a/debian/changelog b/debian/changelog
index 6ef39da..d2ed552 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+xkeyboard-config (1.0~cvs.20070914-1) unstable; urgency=low
+
+ * New upstream CVS snapshot from September 14th 2007:
+ + advertise all Romanian layouts. Thanks Eddy Petrișor for the
+ patch. (Closes: #436993)
+ + fix ctrl:swapcaps. (Closes: #410060)
+ + add missing virtual keys from evdev keycodes. Thanks Yann
+ Vernier for the patch. (Closes: #432613)
+ + support Asus 6000 series laptop keyboard. Thanks Arnout Boelens
+ for the patch. (Closes: #383953)
+ * Update debian/*.dir files.
+
+ -- Mohammed Adnène Trojette <[EMAIL PROTECTED]> Fri, 14 Sep 2007 19:12:27
+0200
+
xkeyboard-config (1.0~cvs.20070721-1) unstable; urgency=low
[ Julien Cristau ]
diff --git a/docs/README.enhancing b/docs/README.enhancing
index 272b201..5e68492 100644
--- a/docs/README.enhancing
+++ b/docs/README.enhancing
@@ -309,12 +309,12 @@ The most used schemes are:
Besides that, there are several schemes for special purposes:
- PC_BREAK
+ PC_CONTROL_LEVEL2
It is similar to TWO_LEVEL scheme but it considers the Control
modifier rather than Shift. That means, the symbol from the sec-
ond level is chosen by Control rather than by Shift.
- PC_SYSRQ
+ PC_ALT_LEVEL2
It is similar to TWO_LEVEL scheme but it considers the Alt modi-
fier rather than Shift. That means, the symbol from the second
level is chosen by Alt rather than by Shift.
diff --git a/geometry/dell b/geometry/dell
index 3700832..76f135e 100644
--- a/geometry/dell
+++ b/geometry/dell
@@ -181,3 +181,362 @@ default xkb_geometry "dell101" {
alias <AA00> = <LCTL>;
}; // End of "default" geometry
+
+
+xkb_geometry "dell65" {
+};
+
+xkb_geometry "dell65x" {
+
+ description= "Dell 101";
+ width= 470;
+ height= 210;
+ color="grey10";
+
+ shape.cornerRadius= 1;
+ shape "NORM" { { [ 18,18] }, { [2,1], [ 16,16] } };
+ shape "BKSP" { { [ 38,18] }, { [2,1], [ 36,16] } };
+ shape "TABK" { { [ 28,18] }, { [2,1], [ 26,16] } };
+ shape "BKSL" { { [ 28,18] }, { [2,1], [ 26,16] } };
+ shape "RTRN" { { [ 42,18] }, { [2,1], [ 40,16] } };
+ shape "CAPS" { { [ 33,18] }, { [ 28,18] }, { [2,1], [ 26,16] } };
+ shape "LFSH" { { [ 42,18] }, { [2,1], [ 40,16] } };
+ shape "RTSH" { { [ 52,18] }, { [2,1], [ 50,16] } };
+ shape "MODK" { { [ 27,18] }, { [2,1], [ 25,16] } };
+ shape "SPCE" { { [133,18] }, { [2,1], [131,16] } };
+ shape "KP0" { { [ 37,18] }, { [2,1], [ 35,16] } };
+ shape "KPAD" { { [ 18,37] }, { [2,1], [ 16,35] } };
+
+ shape "LEDS" { cornerRadius= 0, { [ 75 ,20 ] } };
+ shape "LED" { cornerRadius= 0, { [ 5, 1 ] } };
+ solid "LedPanel" {
+ shape= "LEDS";
+ top= 52;
+ left= 377;
+ color= "grey10";
+ };
+
+ shape "BACKGROUND" { cornerRadius=5, { [ 470, 210 ] } };
+ solid "Background" {
+ shape= "BACKGROUND";
+ top= 0;
+ left= 0;
+ color= "grey10";
+ };
+
+ indicator.onColor= "green";
+ indicator.offColor= "green30";
+ indicator.top= 67;
+ indicator.shape= "LED";
+ indicator "Num Lock" { left= 382; };
+ indicator "Caps Lock" { left= 407; };
+ indicator "Scroll Lock" { left= 433; };
+ text.top= 55;
+ text.color= "black";
+ text "NumLockLabel" { left= 378; text="Num\nLock"; };
+ text "CapsLockLabel" { left= 403; text="Caps\nLock"; };
+ text "ScrollLockLabel" { left= 428; text="Scroll\nLock"; };
+
+ section.left= 19;
+ row.left= 1;
+ key.shape= "NORM";
+ key.gap= 1;
+ section "Function" {
+ top= 52;
+ row {
+ top= 1;
+ keys { { <ESC>, color="grey20" },
+ { <FK01>, 20 }, <FK02>, <FK03>, <FK04>,
+ { <FK05>, 11 }, <FK06>, <FK07>, <FK08>,
+ { <FK09>, 11 }, <FK10>, <FK11>, <FK12>,
+ { <PRSC>, 8 }, <SCLK>, <PAUS>
+ };
+ };
+ }; // End of "Function" section
+
+ section "Alpha" {
+ top= 91;
+ row {
+ top= 1;
+ keys { <TLDE>, <AE01>, <AE02>, <AE03>, <AE04>,
+ <AE05>, <AE06>, <AE07>, <AE08>, <AE09>,
+ <AE10>, <AE11>, <AE12>,
+ { <BKSP>, "BKSP", color="grey20" }
+ };
+ };
+ row {
+ top= 20;
+ keys { { <TAB>, "TABK", color="grey20" },
+ <AD01>, <AD02>, <AD03>, <AD04>, <AD05>,
+ <AD06>, <AD07>, <AD08>, <AD09>, <AD10>,
+ <AD11>, <AD12>, { <BKSL>, "BKSL" }
+ };
+ };
+ row {
+ top= 39;
+ keys { { <CAPS>, "CAPS", color="grey20" },
+ <AC01>, <AC02>, <AC03>, <AC04>, <AC05>,
+ <AC06>, <AC07>, <AC08>, <AC09>, <AC10>,
+ <AC11>, { <RTRN>, "RTRN", color="grey20" }
+ };
+ };
+ row {
+ top= 58;
+ keys { { <LFSH>, "LFSH", color="grey20" },
+ <AB01>, <AB02>, <AB03>, <AB04>, <AB05>,
+ <AB06>, <AB07>, <AB08>, <AB09>, <AB10>,
+ { <RTSH>, "RTSH", color="grey20" }
+ };
+ };
+ row {
+ top= 77;
+ key.shape= "MODK";
+ key.color= "grey20";
+ keys { <LCTL>, { <LALT>, 21 },
+ { <SPCE>, "SPCE", color="white" },
+ <RALT>, { <RCTL>, 21 }
+ };
+ };
+ }; // End of "Alpha" section
+
+ section "Editing" {
+ top= 91;
+ left= 312;
+ key.color= "grey20";
+ row {
+ top= 1;
+ keys { <INS>, <HOME>, <PGUP> };
+ };
+ row {
+ top= 20;
+ keys { <DELE>, <END>, <PGDN> };
+ };
+ row {
+ top= 58;
+ left= 20;
+ keys { <UP> };
+ };
+ row {
+ top= 77;
+ keys { <LEFT>, <DOWN>, <RGHT> };
+ };
+ }; // End of "Editing" section
+
+ section "Keypad" {
+ top= 91;
+ left= 376;
+ row {
+ top= 1;
+ key.color= "grey20";
+ keys { <NMLK>, <KPDV>, <KPMU>, <KPSU> };
+ };
+ row {
+ top= 20;
+ keys { <KP7>, <KP8>, <KP9>, { <KPAD>, "KPAD", color="grey20" } };
+ };
+ row {
+ top= 39;
+ keys { <KP4>, <KP5>, <KP6> };
+ };
+ row {
+ top= 58;
+ keys { <KP1>, <KP2>, <KP3>, { <KPEN>, "KPAD", color="grey20" } };
+ };
+ row {
+ top= 77;
+ keys { { <KP0>, "KP0" }, <KPDL> };
+ };
+ }; // End of "Keypad" section
+
+ alias <AC00> = <CAPS>;
+ alias <AA00> = <LCTL>;
+
+};
+
+
+//
+// Dell Precision M65
+//
+
+xkb_geometry "dellm65" {
+
+ description= "Dell Precision M65";
+ width= 308;
+ height= 152;
+ baseColor = "grey20";
+ labelColor = "white";
+
+ shape "BACKGROUND" { cornerRadius = 3, { [ 308, 152 ] } };
+ shape "BACKGROUND2" { cornerRadius = 2, { [ 7, 22 ],
+ [ 171, 22 ],
+ [ 171, 10 ],
+ [ 301, 10 ],
+ [ 301, 148 ],
+ [ 244, 148 ],
+ [ 244, 132 ],
+ [ 7, 132] } };
+ solid "Background" {
+ shape = "BACKGROUND";
+ top = 0;
+ left = 0;
+ color = "grey20";
+ };
+ solid "Background2" {
+ shape = "BACKGROUND2";
+ top = 0;
+ left = 0;
+ color = "black";
+ };
+
+ shape "LEDS" { cornerRadius = 4, { [ 26, 8 ] } };
+ shape "LED" { cornerRadius = 0, { [ 4, 4 ] } };
+ solid "LedPanel" {
+ shape = "LEDS";
+ top = 8;
+ left = 69;
+ color = "grey20";
+ };
+
+ indicator.onColor= "green";
+ indicator.offColor= "gray20";
+ indicator.top= 10;
+ indicator.shape= "LED";
+ indicator "Num Lock" { left= 72; };
+ indicator "Caps Lock" { left= 80; };
+ indicator "Scroll Lock" { left= 88; };
+
+ shape "MEDIA" { cornerRadius = 5, { [ 2, 2], [ 12, 12 ] } };
+ shape "POWER" { cornerRadius = 7, { [ 14, 14 ] } };
+
+ section "Media" {
+ top = 5;
+ left = 102;
+ width = 60;
+ height = 14;
+ key.color="grey30";
+ key.shape = "MEDIA";
+ row {
+ top = 0;
+ keys {
+ <I2E>, <I30>, <I20>, { <I04>, shape = "POWER", gap = 3 }
+ };
+ };
+ };
+
+
+ shape "FKEY" { cornerRadius = 1, { [ 18, 12 ] }, { [ 1, 1 ], [ 17, 10 ] }
};
+
+ section "Function" {
+ top = 12;
+ left = 8;
+ width = 290;
+ height = 24;
+ key.color = "grey80";
+ key.shape = "FKEY";
+ key.gap = 0;
+ row {
+ top = 0;
+ keys { { <MENU>, 165 }, <PRSC>, <NMLK>, <PAUS>,
+ { <INS>, 1 }, <HOME>, <PGUP> };
+ };
+ row {
+ top = 12;
+ keys { <ESC>, { <FK01>, 1 }, <FK02>, <FK03>, <FK04>,
+ { <FK05>, 1 }, <FK06>, <FK07>, <FK08>,
+ { <FK09>, 1 }, <FK10>, <FK11>, <FK12>,
+ { <DELE>, 1 }, <END>, <PGDN> };
+ };
+ };
+
+ shape "AKEY" { cornerRadius = 1, { [ 19, 19 ] }, { [ 2, 1 ], [ 17, 15 ] } };
+ shape "BKSP" { cornerRadius = 1, { [ 44, 19 ] }, { [ 2, 1 ], [ 42, 15 ] } };
+ shape "TABK" { cornerRadius = 1, { [ 31, 19 ] }, { [ 2, 1 ], [ 29, 15 ] } };
+ shape "BKSL" { cornerRadius = 1, { [ 31, 19 ] }, { [ 2, 1 ], [ 29, 15 ] } };
+ shape "CAPS" { cornerRadius = 1, { [ 34, 19 ] }, { [ 2, 1 ], [ 32, 15 ] } };
+ shape "RTRN" { cornerRadius = 1, { [ 47, 19 ] }, { [ 2, 1 ], [ 45, 15 ] } };
+ shape "LFSH" { cornerRadius = 1, { [ 44, 19 ] }, { [ 2, 1 ], [ 42, 15 ] } };
+ shape "RTSH" { cornerRadius = 1, { [ 56, 19 ] }, { [ 2, 1 ], [ 54, 15 ] } };
+ shape "LCTL" { cornerRadius = 1, { [ 31, 19 ] }, { [ 2, 1 ], [ 29, 15 ] } };
+ shape "LALT" { cornerRadius = 1, { [ 25, 19 ] }, { [ 2, 1 ], [ 23, 15 ] } };
+ shape "RCTL" { cornerRadius = 1, { [ 25, 19 ] }, { [ 2, 1 ], [ 23, 15 ] } };
+ shape "SPCE" { cornerRadius = 1, { [ 96, 19 ] }, { [ 2, 1 ], [ 94, 15 ] } };
+
+
+ section "Alpha" {
+ top = 36;
+ left = 8;
+ width = 290;
+ height = 21;
+ key.color = "grey80";
+ key.shape = "AKEY";
+ key.gap = 0;
+ row {
+ top = 1;
+ keys { <TLDE>, <AE01>, <AE02>, <AE03>, <AE04>,
+ <AE05>, <AE06>, <AE07>, <AE08>, <AE09>,
+ <AE10>, <AE11>, <AE12>, { <BKSP>, 1, "BKSP" } };
+ };
+ row {
+ top = 20;
+ keys { { <TAB>, "TABK" },
+ { <AD01>, 1 }, <AD02>, <AD03>, <AD04>, <AD05>,
+ <AD06>, <AD07>, <AD08>, <AD09>, <AD10>,
+ <AD11>, <AD12>, { <BKSL>, 1, "BKSL" } };
+ };
+ row {
+ top = 39;
+ keys { { <CAPS>, "CAPS" },
+ { <AC01>, 1 }, <AC02>, <AC03>, <AC04>, <AC05>,
+ <AC06>, <AC07>, <AC08>, <AC09>, <AC10>,
+ <AC11>, { <RTRN>, 1, "RTRN" } };
+ };
+ row {
+ top = 58;
+ keys { { <LFSH>, "LFSH" },
+ { <AB01>, 1 }, <AB02>, <AB03>, <AB04>, <AB05>,
+ <AB06>, <AB07>, <AB08>, <AB09>, <AB10>,
+ { <RTSH>, 1, "RTSH" } };
+ };
+ row {
+ top = 77;
+ keys { { <LCTL>, "LCTL" }, { <LWIN>, 20 }, { <LALT>, "LALT" },
+ { <SPCE>, "SPCE" }, <RALT>, { <RCTL>, "RCTL" } };
+ };
+ };
+
+ shape "SKEY" { cornerRadius = 1, { [ 18, 17 ] }, { [ 2, 1 ], [ 16, 13 ] } };
+ section "Arrows" {
+ top = 113;
+ left = 243;
+ width = 54;
+ height = 36;
+
+ key.color = "grey80";
+ key.shape = "SKEY";
+ row {
+ top = 0;
+ left = 20;
+
+ keys { <UP> };
+ };
+
+ row {
+ top = 17;
+ left = 2;
+
+ keys { <LEFT>, <DOWN>, <RGHT> };
+ };
+ };
+
+ shape "STIK" { cornerRadius = 4, { [ 7, 7 ] } };
+
+ solid "STIK" {
+ priority = 255;
+ color = "blue";
+ shape = "STIK";
+ top = 90;
+ left = 135;
+ };
+};
+
+
diff --git a/intltool-extract.in b/intltool-extract.in
index b81e9b4..ee189a8 100644
--- a/intltool-extract.in
+++ b/intltool-extract.in
@@ -32,7 +32,7 @@
## Release information
my $PROGRAM = "intltool-extract";
my $PACKAGE = "intltool";
-my $VERSION = "0.35.5";
+my $VERSION = "0.36.1";
## Loaded modules
use strict;
@@ -237,9 +237,9 @@ sub entity_decode
s/'/'/g; # '
s/"/"/g; # "
- s/&/&/g;
s/</</g;
s/>/>/g;
+ s/&/&/g;
return $_;
}
diff --git a/intltool-merge.in b/intltool-merge.in
index 3015d44..de7c265 100644
--- a/intltool-merge.in
+++ b/intltool-merge.in
@@ -35,7 +35,7 @@
## Release information
my $PROGRAM = "intltool-merge";
my $PACKAGE = "intltool";
-my $VERSION = "0.35.5";
+my $VERSION = "0.36.1";
## Loaded modules
use strict;
@@ -93,9 +93,24 @@ my $OUTFILE;
my %po_files_by_lang = ();
my %translations = ();
-my $iconv = $ENV{"ICONV"} || $ENV{"INTLTOOL_ICONV"} || "@INTLTOOL_ICONV@";
+my $iconv = $ENV{"ICONV"} || "iconv";
my $devnull = ($^O eq 'MSWin32' ? 'NUL:' : '/dev/null');
+sub isProgramInPath
+{
+ my ($file) = @_;
+ # If either a file exists, or when run it returns 0 exit status
+ return 1 if ((-x $file) or (system("$file --version >$devnull") == 0));
+ return 0;
+}
+
+if (! isProgramInPath ("$iconv"))
+{
+ print STDERR " *** iconv is not found on this system!\n".
+ " *** Without it, intltool-merge can not convert
encodings.\n";
+ exit;
+}
+
# Use this instead of \w for XML files to handle more possible characters.
my $w = "[-A-Za-z0-9._:]";
@@ -494,16 +509,15 @@ sub unescape_po_string
return $string;
}
-## NOTE: deal with < - < but not > - > because it seems its ok to have
-## > in the entity. For further info please look at #84738.
sub entity_decode
{
local ($_) = @_;
s/'/'/g; # '
s/"/"/g; # "
- s/&/&/g;
s/</</g;
+ s/>/>/g;
+ s/&/&/g;
return $_;
}
diff --git a/intltool-update.in b/intltool-update.in
index 78fa869..f2300db 100644
--- a/intltool-update.in
+++ b/intltool-update.in
@@ -30,7 +30,7 @@
## Release information
my $PROGRAM = "intltool-update";
-my $VERSION = "0.35.5";
+my $VERSION = "0.36.1";
my $PACKAGE = "intltool";
## Loaded modules
@@ -71,7 +71,8 @@ my $xml_support =
"sheet(?:\\.in)+|". # ?
"schemas(?:\\.in)+|". # GConf specific
"pong(?:\\.in)+|". # DEPRECATED: PONG is not used [by GNOME] any longer.
-"kbd(?:\\.in)+"; # GOK specific.
+"kbd(?:\\.in)+|". # GOK specific.
+"policy(?:\\.in)+"; # PolicyKit files
my $ini_support =
"icon(?:\\.in)+|". # http://www.freedesktop.org/Standards/icon-theme-spec
@@ -328,7 +329,12 @@ sub FindLeftoutFiles
push @buf_i18n_ini, "$File::Find::name" if /\.($ini_support)$/;
push @buf_i18n_xml_unmarked, "$File::Find::name" if
/\.(schemas(\.in)+)$/;
}, "..";
-
+ find sub {
+ push @buf_i18n_plain, "$File::Find::name" if
/\.($buildin_gettext_support)$/;
+ push @buf_i18n_xml, "$File::Find::name" if /\.($xml_support)$/;
+ push @buf_i18n_ini, "$File::Find::name" if /\.($ini_support)$/;
+ push @buf_i18n_xml_unmarked, "$File::Find::name" if
/\.(schemas(\.in)+)$/;
+ }, "$SRCDIR/..";
open POTFILES, $POTFILES_in or die "$PROGRAM: there's no POTFILES.in!\n";
@buf_potfiles = grep !/^(#|\s*$)/, <POTFILES>;
@@ -489,11 +495,15 @@ sub FindLeftoutFiles
my %in2;
foreach (@buf_potfiles_sorted)
{
+ s#^$SRCDIR/../##;
+ s#^$SRCDIR/##;
$in2{$_} = 1;
}
foreach (@buf_potfiles_ignore_sorted)
{
+ s#^$SRCDIR/../##;
+ s#^$SRCDIR/##;
$in2{$_} = 1;
}
@@ -501,9 +511,16 @@ sub FindLeftoutFiles
foreach (@buf_allfiles_sorted)
{
- if (!exists($in2{$_}))
+ my $dummy = $_;
+ my $srcdir = $SRCDIR;
+
+ $srcdir =~ s#^../##;
+ $dummy =~ s#^$srcdir/../##;
+ $dummy =~ s#^$srcdir/##;
+ $dummy =~ s#_build/##;
+ if (!exists($in2{$dummy}))
{
- push @result, $_
+ push @result, $dummy
}
}
@@ -563,11 +580,23 @@ sub Console_WriteError_InvalidOption
exit 1;
}
-sub isIntltoolExtractInPath
+sub isProgramInPath
{
my ($file) = @_;
# If either a file exists, or when run it returns 0 exit status
- return 1 if ((-x $file) or (system("$file >/dev/null") == 0));
+ return 1 if ((-x $file) or (system("$file --version >$devnull") == 0));
+ return 0;
+}
+
+sub isGNUGettextTool
+{
+ my ($file) = @_;
+ # Check that we are using GNU gettext tools
+ if (isProgramInPath ($file))
+ {
+ my $version = `$file --version`;
+ return 1 if ($version =~ m/.*\(GNU .*\).*/);
+ }
return 0;
}
@@ -577,7 +606,7 @@ sub GenerateHeaders
## Generate the .h header files, so we can allow glade and
## xml translation support
- if (! isIntltoolExtractInPath("$EXTRACT"))
+ if (! isProgramInPath ("$EXTRACT"))
{
print STDERR "\n *** The intltool-extract script wasn't found!"
."\n *** Without it, intltool-update can not generate files.\n";
@@ -624,13 +653,13 @@ sub GenerateHeaders
#
sub GeneratePOTemplate
{
- my $XGETTEXT = $ENV{"XGETTEXT"} || "@INTLTOOL_XGETTEXT@";
+ my $XGETTEXT = $ENV{"XGETTEXT"} || "xgettext";
my $XGETTEXT_ARGS = $ENV{"XGETTEXT_ARGS"} || '';
chomp $XGETTEXT;
- if (! -x $XGETTEXT)
+ if (! isGNUGettextTool ("$XGETTEXT"))
{
- print STDERR " *** xgettext is not found on this system!\n".
+ print STDERR " *** GNU xgettext is not found on this system!\n".
" *** Without it, intltool-update can not extract
strings.\n";
exit;
}
@@ -726,7 +755,23 @@ sub GeneratePOTemplate
unlink "$MODULE.pot";
my @xgettext_argument=("$XGETTEXT",
"--add-comments",
- "--directory\=\.",
+ "--directory\=.",
+ "--default-domain\=$MODULE",
+ "--flag\=g_strdup_printf:1:c-format",
+ "--flag\=g_string_printf:2:c-format",
+ "--flag\=g_string_append_printf:2:c-format",
+ "--flag\=g_error_new:3:c-format",
+ "--flag\=g_set_error:4:c-format",
+ "--flag\=g_markup_printf_escaped:1:c-format",
+ "--flag\=g_log:3:c-format",
+ "--flag\=g_print:1:c-format",
+ "--flag\=g_printerr:1:c-format",
+ "--flag\=g_printf:1:c-format",
+ "--flag\=g_fprintf:2:c-format",
+ "--flag\=g_sprintf:2:c-format",
+ "--flag\=g_snprintf:3:c-format",
+ "--flag\=g_scanner_error:2:c-format",
+ "--flag\=g_scanner_warn:2:c-format",
"--output\=$MODULE\.pot",
"--files-from\=\.\/POTFILES\.in\.temp");
my $XGETTEXT_KEYWORDS = &FindPOTKeywords;
@@ -793,9 +838,16 @@ sub POFile_Update
{
-f "$MODULE.pot" or die "$PROGRAM: $MODULE.pot does not exist.\n";
- my $MSGMERGE = $ENV{"MSGMERGE"} || "@INTLTOOL_MSGMERGE@";
+ my $MSGMERGE = $ENV{"MSGMERGE"} || "msgmerge";
my ($lang, $outfile) = @_;
+ if (! isGNUGettextTool ("$MSGMERGE"))
+ {
+ print STDERR " *** GNU msgmerge is not found on this system!\n".
+ " *** Without it, intltool-update can not extract
strings.\n";
+ exit;
+ }
+
print "Merging $SRCDIR/$lang.po with $MODULE.pot..." if $VERBOSE;
my $infile = "$SRCDIR/$lang.po";
@@ -836,7 +888,14 @@ sub POFile_GetLanguage ($)
sub Console_Write_TranslationStatus
{
my ($lang, $output_file) = @_;
- my $MSGFMT = $ENV{"MSGFMT"} || "@INTLTOOL_MSGFMT@";
+ my $MSGFMT = $ENV{"MSGFMT"} || "msgfmt";
+
+ if (! isGNUGettextTool ("$MSGFMT"))
+ {
+ print STDERR " *** GNU msgfmt is not found on this system!\n".
+ " *** Without it, intltool-update can not extract
strings.\n";
+ exit;
+ }
$output_file = "$SRCDIR/$lang.po" if ($output_file eq "");
@@ -845,21 +904,28 @@ sub Console_Write_TranslationStatus
sub Console_Write_CoverageReport
{
- my $MSGFMT = $ENV{"MSGFMT"} || "@INTLTOOL_MSGFMT@";
+ my $MSGFMT = $ENV{"MSGFMT"} || "msgfmt";
+
+ if (! isGNUGettextTool ("$MSGFMT"))
+ {
+ print STDERR " *** GNU msgfmt is not found on this system!\n".
+ " *** Without it, intltool-update can not extract
strings.\n";
+ exit;
+ }
&GatherPOFiles;
foreach my $lang (@languages)
{
- print "$lang: ";
+ print STDERR "$lang: ";
&POFile_Update ($lang, "");
}
- print "\n\n * Current translation support in $MODULE \n\n";
+ print STDERR "\n\n * Current translation support in $MODULE \n\n";
foreach my $lang (@languages)
{
- print "$lang: ";
+ print STDERR "$lang: ";
system ("$MSGFMT", "-o", "$devnull", "--verbose", "$SRCDIR/$lang.po");
}
}
@@ -933,13 +999,13 @@ sub CONF_Handle_Open
$conf_in || die "Cannot find top_builddir in Makevars.";
}
- elsif (-f "../configure.ac")
+ elsif (-f "$SRCDIR/../configure.ac")
{
- $conf_in = "../configure.ac";
+ $conf_in = "$SRCDIR/../configure.ac";
}
- elsif (-f "../configure.in")
+ elsif (-f "$SRCDIR/../configure.in")
{
- $conf_in = "../configure.in";
+ $conf_in = "$SRCDIR/../configure.in";
}
else
{
diff --git a/keycodes/evdev b/keycodes/evdev
index 9eed3d9..1c246d4 100644
--- a/keycodes/evdev
+++ b/keycodes/evdev
@@ -1,7 +1,7 @@
// translation from evdev scancodes to something resembling xfree86 keycodes.
default xkb_keycodes "evdev" {
- minimum = 8;
+ minimum = 1;
maximum = 255;
# Added for pc105 compatibility
@@ -154,6 +154,7 @@ default xkb_keycodes "evdev" {
<KATA> = 98; // Katakana
<HIRA> = 99; // Hiragana
<JPCM> = 103; // KPJPComma
+ <RO> = 97; // Romaji
// Keys that are generated on Korean keyboards
@@ -183,7 +184,6 @@ default xkb_keycodes "evdev" {
// Extended keys that may be generated on "Internet" keyboards.
// evdev has standardize names for these.
- <RO> = 97; // #define KEY_RO 89
<LNFD> = 109; // #define KEY_LINEFEED 101
<I120> = 120; // #define KEY_MACRO 112
<I126> = 126; // #define KEY_KPPLUSMINUS 118
@@ -258,20 +258,45 @@ default xkb_keycodes "evdev" {
<I232> = 232; // #define KEY_BRIGHTNESSDOWN 224
<I233> = 233; // #define KEY_BRIGHTNESSUP 225
<I234> = 234; // #define KEY_MEDIA 226
- <I235> = 235; // #define KEY_SWITCHVIDEOMODE 227
- <I236> = 236; // #define KEY_KBDILLUMTOGGLE 228
- <I237> = 237; // #define KEY_KBDILLUMDOWN 229
- <I238> = 238; // #define KEY_KBDILLUMUP 230
+ <OUTP> = 235; // #define KEY_SWITCHVIDEOMODE 227
+ <KITG> = 236; // #define KEY_KBDILLUMTOGGLE 228
+ <KIDN> = 237; // #define KEY_KBDILLUMDOWN 229
+ <KIUP> = 238; // #define KEY_KBDILLUMUP 230
<I239> = 239; // #define KEY_SEND 231
<I240> = 240; // #define KEY_REPLY 232
<I241> = 241; // #define KEY_FORWARDMAIL 233
<I242> = 242; // #define KEY_SAVE 234
<I243> = 243; // #define KEY_DOCUMENTS 235
<I244> = 244; // #define KEY_BATTERY 236
+ <I245> = 245; // #define KEY_BLUETOOTH 237
+ <I246> = 246; // #define KEY_WLAN 238
+ <I247> = 247; // (not defined in input.h) 239
+ <I248> = 248; // #define KEY_UNKNOWN 240
+ <I249> = 249; // #define KEY_VIDEO_NEXT 241
+ <I250> = 250; // #define KEY_VIDEO_PREV 242
+ <I251> = 251; // #define KEY_BRIGHTNESS_CYCLE 243
+ <I252> = 252; // #define KEY_BRIGHTNESS_ZERO 244
+ <I253> = 253; // #define KEY_DISPLAY_OFF 245
- indicator 1 = "Caps Lock";
- indicator 2 = "Num Lock";
- indicator 3 = "Scroll Lock";
+ // Fake keycodes for virtual keys
+ <MDSW> = 1;
+ <LVL3> = 2;
+ <ALT> = 3;
+ <META> = 4;
+ <SUPR> = 5;
+ <HYPR> = 6;
+
+ indicator 1 = "Caps Lock";
+ indicator 2 = "Num Lock";
+ indicator 3 = "Scroll Lock";
+ indicator 4 = "Compose";
+ indicator 5 = "Kana";
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
