X Strike Force XFree86 SVN commit: r1850 - in people/fabbione/nv-driver-backport/debian: . local patches po
Author: fabbione
Date: 2004-09-22 03:52:22 -0500 (Wed, 22 Sep 2004)
New Revision: 1850
Added:
people/fabbione/nv-driver-backport/debian/patches/099z_xkb_fix_rules_xfree86.diff
Removed:
people/fabbione/nv-driver-backport/debian/patches/087_xkb_fix_altwin.diff
people/fabbione/nv-driver-backport/debian/patches/098_nv_xvideo_fullscreen_fix.diff
Modified:
people/fabbione/nv-driver-backport/debian/CHANGESETS
people/fabbione/nv-driver-backport/debian/TODO
people/fabbione/nv-driver-backport/debian/changelog
people/fabbione/nv-driver-backport/debian/local/FAQ.xhtml
people/fabbione/nv-driver-backport/debian/patches/000_stolen_from_HEAD_xkb_data.diff
people/fabbione/nv-driver-backport/debian/po/ca.po
people/fabbione/nv-driver-backport/debian/po/cs.po
people/fabbione/nv-driver-backport/debian/po/da.po
people/fabbione/nv-driver-backport/debian/po/de.po
people/fabbione/nv-driver-backport/debian/po/el.po
people/fabbione/nv-driver-backport/debian/po/es.po
people/fabbione/nv-driver-backport/debian/po/fr.po
people/fabbione/nv-driver-backport/debian/po/gl.po
people/fabbione/nv-driver-backport/debian/po/it.po
people/fabbione/nv-driver-backport/debian/po/ja.po
people/fabbione/nv-driver-backport/debian/po/nl.po
people/fabbione/nv-driver-backport/debian/po/pl.po
people/fabbione/nv-driver-backport/debian/po/pt_BR.po
people/fabbione/nv-driver-backport/debian/po/ru.po
people/fabbione/nv-driver-backport/debian/po/sv.po
people/fabbione/nv-driver-backport/debian/po/templates.pot
people/fabbione/nv-driver-backport/debian/po/tr.po
Log:
Resync from trunk at r1848
Modified: people/fabbione/nv-driver-backport/debian/CHANGESETS
===================================================================
--- people/fabbione/nv-driver-backport/debian/CHANGESETS 2004-09-22 08:50:51 UTC (rev 1849)
+++ people/fabbione/nv-driver-backport/debian/CHANGESETS 2004-09-22 08:52:22 UTC (rev 1850)
@@ -9,9 +9,9 @@
files anywhere.)
Miscellaneous cosmetic fixes.
- 1811, 1812, 1815, 1816
+ 1811, 1812, 1815, 1816, 1828, 1829, 1830, 1842, 1846
-Update Danish debconf template translations (thanks, Claus Hindsgaul)
+Update Danish debconf template translations (thanks, Claus Hindsgaul).
1806
In the Xsession script, attempt to create a file of non-zero length in
@@ -22,4 +22,48 @@
is defined. Fixes FTBFS on s390.
1814
+Grab /etc/X11/xkb/symbols/pc/us_intl from XFree86 CVS (2003-10-04). This
+makes us_intl multi-layout aware, and binds the right Meta key to
+Mode_Switch. (Closes: #271326, #234085)
+ 1820, 1824
+
+Revert upstream change to altwin behavior applied in 4.3.0.dfsg.1-1.
+The Meta_* keysyms must be removed from the shift level of Alt keys when
+altwin:meta_win or altwin:left_meta_win are used; otherwise, XKB-unaware
+applications (like GNU Emacs) may believe that mod1 and mod4 are bound to
+Meta keys.
+ 1821
+
+Fix inconsistencies in rules/xfree86* files:
++ rules/xfree86: List in $oldlayouts all layouts which are currently not
+ multi-layout aware in the Debian xlibs package, including hu_US (thanks,
+ Veres Lajos). (Closes: #247463, #270810)
++ rules/xfree86: Support the lv3:ralt_switch option, which exists in
+ xfree86.lst but was forgotten in this file.
++ rules/xfree86: Remove special case that causes PC keyboard models with
+ the us_intl layout to load the us layout and add the us_intl layout to
+ it. (Closes: #234085)
++ rules/xfree86.{lst,xml}: Replace the options altwin:meta_super and
+ altwin:meta_hyper with the correct names altwin:super_win and
+ altwin:hyper_win. (Closes: #271259)
++ rules/xfree86.{lst,xml}: Synchronize these files.
+ 1822, 1825, 1826
+
+Add FAQ entry: My keyboard configuration worked with XFree86 4.2; why is
+it messed up now? (Closes: #259740)
+ 1823, 1832, 1835, 1836, 1838, 1839
+
+Add FAQ entry: How does the keyboard work in the X Window System?
+ 1840
+
+Make minor expansions and corrections to the FAQ.
+ 1841
+
+Update Japanese debconf template translations (thanks, Kenshi Muto).
+ 1843
+
+Re-run debian/rules's updatepo target, fixing some line wrapping and other
+cosmetic issues in recent translation updates.
+ 1844
+
vim:set ai et sts=4 sw=4 tw=80:
Modified: people/fabbione/nv-driver-backport/debian/TODO
===================================================================
--- people/fabbione/nv-driver-backport/debian/TODO 2004-09-22 08:50:51 UTC (rev 1849)
+++ people/fabbione/nv-driver-backport/debian/TODO 2004-09-22 08:52:22 UTC (rev 1850)
@@ -17,6 +17,8 @@
4.3.0.dfsg.1-8
--------------
+* Fix Xpm library stack and integer overflow vulnerabilities. (#272493; woody
+ security update already in progress)
* Fix for the nv driver breakage, consider backporting the driver from
x.org.
See: #269025, #268759, #271235, #270228, #271071
@@ -53,11 +55,6 @@
+ Use /proc/hardware on m68k architecture to set a reasonable default mouse
port. See <URL: http://lists.debian.org/debian-68k/2004/08/msg00392.html>.
* Add FAQ entry describing Debian's plans in the X department.
-* Check the contents of rules/xfree86.lst, it is used by GNOME and other
- applications, and contain some bogus entries (like altwin:meta_super option).
- (See #271259)
-* The $oldlayouts variable in rules/xfree86 must list all layouts which are
- only available in old layout. (See #270810)
4.3.0.dfsg.1-9
--------------
Modified: people/fabbione/nv-driver-backport/debian/changelog
===================================================================
--- people/fabbione/nv-driver-backport/debian/changelog 2004-09-22 08:50:51 UTC (rev 1849)
+++ people/fabbione/nv-driver-backport/debian/changelog 2004-09-22 08:52:22 UTC (rev 1850)
@@ -5,11 +5,42 @@
* Update Danish debconf template translations (thanks, Claus Hindsgaul).
(Closes: #270503)
+ * Grab /etc/X11/xkb/symbols/pc/us_intl from XFree86 CVS (2003-10-04). This
+ makes us_intl multi-layout aware, and binds the right Meta key to
+ Mode_Switch. (Closes: #271326, #234085)
+
+ * Revert upstream change to altwin behavior applied in 4.3.0.dfsg.1-1.
+ The Meta_* keysyms must be removed from the shift level of Alt keys when
+ altwin:meta_win or altwin:left_meta_win are used; otherwise, XKB-unaware
+ applications (like GNU Emacs) may believe that mod1 and mod4 are bound to
+ Meta keys.
+
+ * Fix inconsistencies in rules/xfree86* files:
+ + rules/xfree86: List in $oldlayouts all layouts which are currently not
+ multi-layout aware in the Debian xlibs package, including hu_US (thanks,
+ Veres Lajos). (Closes: #247463, #270810)
+ + rules/xfree86: Support the lv3:ralt_switch option, which exists in
+ xfree86.lst but was forgotten in this file.
+ + rules/xfree86: Remove special case that causes PC keyboard models with
+ the us_intl layout to load the us layout and add the us_intl layout to
+ it. (Closes: #234085)
+ + rules/xfree86.{lst,xml}: Replace the options altwin:meta_super and
+ altwin:meta_hyper with the correct names altwin:super_win and
+ altwin:hyper_win. (Closes: #271259)
+ + rules/xfree86.{lst,xml}: Synchronize these files.
+
+ Changes by Denis Barbier and Branden Robinson:
+
+ * Add FAQ entry: My keyboard configuration worked with XFree86 4.2; why is
+ it messed up now? (Closes: #259740)
+
Changes by Branden Robinson:
* In the Xsession script, attempt to create a file of non-zero length in
/tmp; a full filesystem can cause mysterious X session failures.
+ * Add FAQ entry: How does the keyboard work in the X Window System?
+
Changes by Fabio M. Di Nitto:
* Create debian/tmp/usr/X11R6/lib/X11/doc when NOT_BUILDING_XFREE86_X_SERVER
@@ -31,8 +62,12 @@
- Now included upstream.
+ Rediff 911_debian_XF86Config_to_XF86Config-4.diff.
- -- Branden Robinson <branden@debian.org> Sun, 12 Sep 2004 23:45:07 -0500
+ Changes by ISHIKAWA Mutsumi:
+ * Update Japanese debconf template translations (thanks, Kenshi Muto).
+
+ -- Branden Robinson <branden@debian.org> Tue, 21 Sep 2004 15:49:27 -0500
+
xfree86 (4.3.0.dfsg.1-7) unstable; urgency=high
Changes by Branden Robinson:
@@ -493,7 +528,7 @@
* Update Italian debconf template translations (thanks, Danilo Piazzalunga).
(Closes: #270126)
- * Update French debconf template translations (thanks, Clement Stenac)
+ * Update French debconf template translations (thanks, Clement Stenac).
-- Fabio M. Di Nitto <fabbione@fabbione.net> Mon, 06 Sep 2004 09:54:18 +0200
Modified: people/fabbione/nv-driver-backport/debian/local/FAQ.xhtml
===================================================================
--- people/fabbione/nv-driver-backport/debian/local/FAQ.xhtml 2004-09-22 08:50:51 UTC (rev 1849)
+++ people/fabbione/nv-driver-backport/debian/local/FAQ.xhtml 2004-09-22 08:52:22 UTC (rev 1850)
@@ -59,6 +59,8 @@
<li><a href="#deffocus">What is window focus?</a></li>
<li><a href="#defresourc">What are X resources?</a></li>
<li><a href="#defappdef">What are app-defaults?</a></li>
+<li><a href="#keyboard">How does the keyboard work in the X Window
+ System?</a></li>
</ul>
<h2><a href="#specquest">Specific Questions</a></h2>
@@ -150,6 +152,8 @@
my X session exiting abnormally?</a></li>
<li><a href="#radeondualhead">I'm having trouble getting dual-head support to
work on my ATI Radeon card. Can you help?</a></li>
+<li><a href="#xkbnewlayout">My keyboard configuration worked with XFree86 4.2;
+ why is it messed up now?</a></li>
</ul>
<h2><a href="#acknowledgements">Acknowledgements</a></h2>
@@ -780,6 +784,145 @@
default settings for a client. They work as if they were part of the client
binary itself.</p>
+<h3><a id="keyboard">How does the keyboard work in the X Window System?</a></h3>
+
+<!--
+<p>First of all, please note that this is a highly simplified treatment of the
+subject.</p>
+
+<p>Let's begin with a glossary to which you can refer.</p>
+-->
+
+<p><em>It will take some time to write a comprehensive entry on this subject,
+but in the meantime it is hoped that the following glossary is useful.</em></p>
+
+<dl>
+ <dt><strong>compose key</strong></dt>
+ <dd>a key which causes the next two keys pressed to be treated specially
+ such that they cause a single character to be printed (this is implemented
+ in software); for example, pressing <kbd>Compose + A + E</kbd> would produce
+ the ae ligature (æ); valid compose sequences are defined in
+ locale-specific data files such as <code
+ class="filespec">/usr/X11R6/lib/X11/locale/en_US.UTF-8/Compose</code>; the X
+ Window System's <strong>keysym</strong> for this key is
+ <code>Multi_key</code></dd>
+ <dt><strong>dead key</strong></dt>
+ <dd>a key, typically engraved with an accent, diacritic, or other mark which
+ produces no character by itself but instead modifies the character generated
+ by the next key pressed (this is implemented in software); for example, on a
+ keyboard with dead keys, pressing a key engraved with an acute accent
+ (´) <strong>glyph</strong> followed by the <code>A</code> key would
+ produce an "a" with an acute accent (á), whereas pressing the acute
+ accent ("dead acute") key followed by a space would produce the acute accent
+ by itself (´); contrast with <strong>spacing key</strong></dd>
+ <dt><strong>engraving</strong></dt>
+ <dd>the visible marking(s) on a <strong>keycap</strong>, which indicate the
+ key's behavior via a <strong>glyph</strong> (such as <code>Q</code> or
+ <code>\</code>) or term describing a control function (such as
+ <code>Enter</code>, <code>Shift</code>, or <code>Scroll Lock</code>)</dd>
+ <dt><strong>keycap</strong></dt>
+ <dd>the surface of a key; the part of a key which is pressed and bears
+ <strong>engraving</strong>s</dd>
+ <dt><strong>keycode</strong></dt>
+ <dd>a <strong>scan code</strong> after it has undergone translation (if any)
+ by the operating system and X server</dd>
+ <dt><strong>keymap</strong></dt>
+ <dd>a complete description of a keyboard device which is used by the X
+ server to translate <strong>keycodes</strong> into <strong>keysyms</strong>
+ and <strong>modifier masks</strong>; when XKB is used, this includes
+ <strong>compat</strong>, <strong>geometry</strong>,
+ <strong>keycodes</strong>, <strong>symbols</strong>, and
+ <strong>types</strong> information</dd>
+ <dt><strong>keysym</strong></dt>
+ <dd>a symbolic name for a key, independent of the operating system and
+ keyboard hardware, which identifies a key to X clients</dd>
+ <dt><strong>layout</strong></dt>
+ <dd>an <strong>XKB</strong> configuration parameter that identifies the
+ territorial specifics of a keyboard model; two given keyboards may have the
+ same physical key arrangment but different <strong>engraving</strong>s on
+ the keys, each keyboard customized to a different region or territory</dd>
+ <dt><strong>logo key</strong></dt>
+ <dd>a platform- and trademark-independent term for keys typically engraved
+ with the logo of an operating system or its manufacturer; for example, these
+ keys are referred to as "Windows keys" on PCs and "Apple keys" or "command
+ keys" on Macintoshes (furthermore, some enterprising keyboard suppliers have
+ engraved these keys with Tux the penguin, the Linux mascot); since the X
+ Window System <strong>keysym</strong> list antedates these keyboards, these
+ keys are often mapped to one of the modifier keys (<code>Meta</code>,
+ <code>Super</code>, or <code>Hyper</code>) from the notorious <a
+ href="http://foldoc.doc.ic.ac.uk/foldoc/foldoc.cgi?space-cadet+keyboard";>Symbolics
+ "Space Cadet" keyboard</a>, which was no doubt popular at MIT at the time
+ the X Window System was developed</dd>
+ <dt><strong>model</strong></dt>
+ <dd>an <strong>XKB</strong> configuration parameter that identifies what
+ physical model of a keyboard is in use; used to determine what
+ <strong>keycodes</strong> are supported by the model and what its
+ <strong>geometry</strong> is</dd>
+ <dt><strong>modifier</strong></dt>
+ <dd>a flag (up or down) which can influence how <strong>keycode</strong>s
+ are translated to <strong>keysym</strong>s, and how X clients interpret key
+ events</dd>
+ <dt><strong>modifier mask</strong></dt>
+ <dd>a list of <strong>modifier</strong> states; these are
+ bitwise-<code>OR</code>ed together as the "state" value reported with key
+ events by the <code
+ class="command">xev</code> command</dd>
+ <dt><strong>options</strong></dt>
+ <dd>an <strong>XKB</strong> configuration parameter that permits the user to
+ customize aspects of keyboard behavior that are not specific to a
+ <strong>layout</strong>; for example, <code>ctrl:nocaps</code> is a popular
+ option to make the <code>Caps Lock</code> key produce the
+ <code>Control_L</code> <strong>keysym</strong>; that is, work like an
+ additional (left) <code>Control</code> key</dd>
+ <dt><strong>rules</strong></dt>
+ <dd>an <strong>XKB</strong> configuration parameter that identifies a data
+ file (such as <code>xfree86</code>) describing how <strong>model</strong>,
+ <strong>layout</strong>, <strong>variant</strong>, and
+ <strong>options</strong> specifications are translated into
+ <strong>compat</strong>, <strong>geometry</strong>,
+ <strong>keycodes</strong>, <strong>symbols</strong>, and
+ <strong>types</strong> information</dd>
+ <dt><strong>scan code</strong></dt>
+ <dd>a number which uniquely identifies a key on the keyboard, and which is
+ transmitted by the hardware to the operating system; scan codes tend to be
+ specific to the keyboard hardware</dd>
+ <dt><strong>spacing key</strong></dt>
+ <dd>a key which causes a character corresponding to the
+ <strong>glyph</strong> engraved on it to be printed; contrast with
+ <strong>dead key</strong></dd>
+ <dt><strong>variant</strong></dt>
+ <dd>an <strong>XKB</strong> configuration parameter that allows for
+ differing behavior of certain keys within a given <strong>layout</strong>;
+ for example, <code>nodeadkeys</code> is a popular variant in many European
+ <strong>layout</strong>s — it causes <strong>dead key</strong>s to be
+ treated as <strong>spacing key</strong>s</dd>
+ <dt><strong>XKB</strong></dt>
+ <dd>the X KEYBOARD extension, an extension to the X protocol providing a
+ more sophisticated means of describing keyboard events than that supported
+ by the core protocol</dd>
+<!--
+ <dt><strong>compat</strong></dt>
+ <dt><strong>geometry</strong></dt>
+ <dt><strong>keycodes</strong></dt>
+ <dt><strong>symbols</strong></dt>
+ <dt><strong>types</strong></dt>
+-->
+</dl>
+
+<p>When the XFree86 X server is started, it calls the <code
+class="command">setxkbmap</code> utility to compile a keymap from the XKB
+configuration options (<code>XkbRules</code>, <code>XkbModel</code>,
+<code>XkbLayout</code>, <code>XkbVariant</code>, and <code>XkbOptions</code>)
+from its configuration file (usually <code
+class="filespec">/etc/X11/XF86Config-4</code>). The XFree86 X server can be
+told to disable XKB with the option <code>XkbDisable</code>. Furthermore, X
+servers in general can be told not to load an XKB keymap with the option
+<kbd>-noloadxkb</kbd>, or to load a pre-compiled keymap with the
+<kbd>-xkbmap</kbd> option. This last option is useful for machines configured
+as X terminals, since they enable the X server to do without the <code
+class="command">setxkbmap</code> command, which in turn depends on <code
+class="command">xkbcomp</code>, the XKB data files, and the X libraries.</p>
+
<h2><a id="specquest" class="bigtext">Specific Questions</a></h2>
<h3><a id="custxsess">How do I customize my X session?</a></h3>
@@ -2673,12 +2816,93 @@
class="other">MonitorLayout</code> line, but I can't think of a physical
mechanism for this actually happening.</p>
+<h3><a id="xkbnewlayout">My keyboard configuration worked with XFree86 4.2;
+ why is it messed up now?</a></h3>
+
+<p><em>Thanks to Denis Barbier for contributing much of this entry.</em></p>
+
+<p><em>Please see the glossary in <a href="#keyboard">"How does the keyboard work
+in the X Window System?"</a> above for explanantions of unfamiliar
+terms.</em></p>
+
+<p>Many users of the X Window System, particularly outside the United States,
+find that they need support for multiple <em>groups</em> on their keyboards.
+One or more of the keys on their keyboards are engraved with more than two
+glyphs. On a typical U.S. keyboard, there are at most two glyphs on each keycap
+— one is accessed with a <code>Shift</code> or <code>Caps Lock</code> key,
+and one without. Many keyboards outside the United States enable access to
+glyphs beyond the third with modifier keys not found on most U.S. keyboards.
+One approach is with an <code>AltGr</code> (alternate group) key, which is
+analogous to <code>Shift</code>. The other approach is with a <code>Mode
+Switch</code> key, which is analogous to <code>Caps Lock</code>. When either of
+these keys are pressed, the X Window System needs to know to switch to an
+alternative key layout — preferably one which corresponds to the
+engravings on the user's keyboard. A U.S. keyboard, even if keys are remapped
+so that <code>AltGr</code> and/or <code>Mode Switch</code> keys are available,
+does not acquire much meaningful additional functionality unless and alternate
+group is defined in software, so that "the keys know what to do" when the
+alternate group is enabled.</p>
+
+<p>Sometimes a key layout for a given territory (such as <code>gb</code> for the
+United Kingdom or <code>fr</code> for France) defines what should be in the
+alternate group. For example, on many European keyboards, one can press
+<kbd>AltGr + E</kbd> to produce the Euro sign (€). This approach is often
+taken when most keys don't need an symbol defined for the alternate group,
+because most keys are engraved with two or fewer glyphs. </p>
+
+<p>Other times, however, most or all of the printing keys on the keyboard are
+engraved with primary group <em>and</em> alternate group glyphs. Russian
+keyboards, for example, because they must support both the Latin and Cyrillic
+alphabets, often work this way. As a consequence, users of the X Window System
+need a way to <em>combine layouts</em>.</p>
+
+<p>Prior to XFree86 4.3, combining layouts was difficult because keyboard
+symbols (<em>keysyms</em>) were defined to be specific to a given group. For
+example, the <code>us</code> symbols file (in <code
+class="filespec">/etc/X11/xkb/symbols/</code>) defined the its keycode to keysym
+mappings specifically for group 1 — the primary group. The
+<code>us_group2</code> and <code>us_group3</code> files repeated these
+definitions for group 2 and group 3, respectively. In addition to being
+wasteful, alternative group layouts were never copied in this fashion for any
+territory except the U.S. Combining Russian and French layouts, for example,
+was consequently impossible without modifying the XKB data files directly
+— a skill most users do not possess.</p>
+
+<p>XKB layouts have been revisited in XFree86 4.3, and new definitions can now
+be used in arbitrary order so that <code>us,ru</code> and <code>ru,us</code> use
+the same <code>symbols</code> files. The new definitions have been placed in
+<code class="filespec">/etc/X11/xkb/symbols/pc/</code> while the old ones are
+still available in their traditional location; that is, directly within the
+<code class="filespec">/etc/X11/xkb/symbols/</code> directory.</p>
+
+<p>Some symbols files have not been converted to the new multi-layout approach,
+and thus can not be combined with others. These are listed as
+<code>$old_layouts</code> in <code
+class="filespec">/etc/X11/xkb/rules/xfree86</code>. If you have trouble
+combining layouts, check that you are not trying to load a layout listed
+there.</p>
+
+<p>Modifiers have also been affected by these changes to make the system more
+modular. A consequence is that <em>fake keys</em> have been introduced in XKB
+data files for <code>Alt</code>, <code>Meta</code>, <code>Super</code> and
+<code>Hyper</code>. (The fake keys are distinguished from real keys by not
+being pair-oriented to the "left" or "right". Even keyboards that have only one
+of a pair of such keys — like laptop keyboards — report the keys
+they do have as being either left or right, for compatibility with full-size
+models.) By default, the modifiers <code>mod1</code> and <code>mod4</code> use
+these fake keys instead of real ones. XKB-aware applications can handle those
+fake keys, but some applications, like <application>GNU Emacs</application>, get
+confused and will not recognize your keys as modifiers. Until these
+applications are fixed, you can bind keys explicitly with <code>altwin</code>
+XKB options; for example, <kbd>Option "XkbOptions" "altwin:super_win"</kbd>
+binds your logo keys to <code>Super</code> modifiers.</p>
+
<h2><a id="acknowledgements">Acknowledgements</a></h2>
<p>The author would like to thank Andreas Metzler, Guillem Jover, Ingo Saitz,
Osamu Aoki, Matthew Arnison, Colin Walters, Steve Swales, Adam Jackson, Thomas
-Dickey, Paul Gotch, Albert Cahalan, and "ulisses" for their contributions to
-this document.</p>
+Dickey, Paul Gotch, Albert Cahalan, Denis Barbier, and "ulisses" for their
+contributions to this document.</p>
<hr />
<p class="x-small">$Id$</p>
Modified: people/fabbione/nv-driver-backport/debian/patches/000_stolen_from_HEAD_xkb_data.diff
===================================================================
--- people/fabbione/nv-driver-backport/debian/patches/000_stolen_from_HEAD_xkb_data.diff 2004-09-22 08:50:51 UTC (rev 1849)
+++ people/fabbione/nv-driver-backport/debian/patches/000_stolen_from_HEAD_xkb_data.diff 2004-09-22 08:52:22 UTC (rev 1850)
@@ -1,6 +1,6 @@
$Id$
-vim:set encoding=latin1:
+[Do not recode this file!]
This file is for XKB data. This basically means any subdirectory of
xc/programs/xkbcomp (except xc/programs/xkbcomp/cross). Changes within
@@ -172,6 +172,10 @@
xc/programs/xkbcomp/symbols/inet @ 1.33 [PARTIAL]
436. Added support for the Compaq Evo keyboard (Stanislav Brabec).
+xc/programs/xkbcomp/symbols/pc/us_intl @ 1.1
+ 476. Fixes and updates for XKB keyboard maps:
+ - Add multi_layout compliant 'us_intl' keymap (Ivan Pascal).
+
xc/programs/xkbcomp/compat/misc @ 1.5
633. Fixes for XKB keyboard maps:
- fix Meta, Super, Hyper keysyms interpretation
@@ -4757,6 +4761,67 @@
+ key <BKSL> { [ backslash, bar ] };
// End alphanumeric section
};
+Index: xc/programs/xkbcomp/symbols/pc/us_intl
+===================================================================
+RCS file: /cvs/xc/programs/xkbcomp/symbols/pc/us_intl,v
+diff -N us_intl
+--- /dev/null 1 Jan 1970 00:00:00 -0000
++++ xc/programs/xkbcomp/symbols/pc/us_intl 4 Oct 2003 10:25:14 -0000 1.1
+@@ -0,0 +1,54 @@
++// $XFree86: xc/programs/xkbcomp/symbols/pc/us_intl,v 1.1 2003/10/04 10:25:14 pascal Exp $
++
++// Based on symbols/us_intl keyboard map:
++// Dead-keys definition for a very simple US/ASCII layout.
++// by Conectiva (http://www.conectiva.com.br)
++// modified by Ricardo Y. Igarashi (iga@that.com.br)
++
++// Added the following deadkeys, to make it truly international:
++//
++// dead_macron: on AltGr-minus
++// dead_breve: on AltGr-parenleft
++// dead_abovedot: on AltGr-period
++// dead_abovering: on AltGr-0
++// dead_doubleacute: on AltGr-equal (as quotedbl is already used)
++// dead_caron: on AltGr-less (AltGr-shift-comma)
++// dead_cedilla: on AltGr-comma
++// dead_ogonek: on AltGr-semicolon
++// dead_belowdot: on AltGr-underscore (AltGr-shift-minus)
++// dead_hook: on AltGr-question
++// dead_horn: on AltGr-plus (AltGr-shift-equal)
++// dead_diaeresis: on AltGr-colon (Alt-shift-semicolon)
++//
++// those were already there:
++// dead_grave
++// dead_acute
++// dead_circumflex
++// dead_tilde
++// dead_diaeresis
++
++partial default alphanumeric_keys
++xkb_symbols "basic" {
++
++ name[Group1]= "US/ASCII";
++ include "pc/us"
++
++ key <TLDE> { [ dead_grave, dead_tilde, grave, asciitilde ] };
++ key <AE05> { [ 5, percent, EuroSign ] };
++ key <AE06> { [ 6, dead_circumflex, asciicircum, asciicircum ] };
++ key <AE09> { [ 9, parenleft, dead_breve, dead_breve ] };
++ key <AE10> { [ 0, parenright, dead_abovering, dead_abovering] };
++ key <AE11> { [ minus, underscore, dead_macron, dead_belowdot ] };
++ key <AE12> { [ equal, plus, dead_doubleacute, dead_horn ] };
++
++ key <AD03> { [ e, E, EuroSign, cent ] };
++
++ key <AC10> { [ semicolon, colon, dead_ogonek, dead_diaeresis ] };
++ key <AC11> { [ dead_acute, dead_diaeresis, apostrophe, quotedbl ] };
++
++ key <AB08> { [ comma, less, dead_cedilla, dead_caron ] };
++ key <AB09> { [ period, greater, dead_abovedot, dead_circumflex ] };
++ key <AB10> { [ slash, question, dead_hook, dead_hook ] };
++
++ include "level3(ralt_switch_multikey)"
++};
Index: xc/programs/xkbcomp/symbols/pc/yu
===================================================================
RCS file: /cvs/xc/programs/xkbcomp/symbols/pc/yu,v
Deleted: people/fabbione/nv-driver-backport/debian/patches/087_xkb_fix_altwin.diff
===================================================================
--- people/fabbione/nv-driver-backport/debian/patches/087_xkb_fix_altwin.diff 2004-09-22 08:50:51 UTC (rev 1849)
+++ people/fabbione/nv-driver-backport/debian/patches/087_xkb_fix_altwin.diff 2004-09-22 08:52:22 UTC (rev 1850)
@@ -1,33 +0,0 @@
-$Id$
-
-Fix the altwin:meta_win and altwin:left_meta_win XKB options to not
-override current definitions of Alt keys or the Mod1 modifier map. See
-Debian #234081 and #241034.
-
-This patch by Denis Barbier.
-
-Submitted to XFree86 by Denis Barbier on 2004-04-22; applied to upstream
-CVS on 2004-05-08 as revision 1.6.
-
---- xc/programs/xkbcomp/symbols/altwin.orig 2004-04-17 00:46:14.000000000 +0200
-+++ xc/programs/xkbcomp/symbols/altwin 2004-04-17 00:47:24.000000000 +0200
-@@ -10,19 +10,14 @@
-
- partial modifier_keys
- xkb_symbols "meta_win" {
-- key <LALT> { [ Alt_L, Alt_L ] };
-- key <RALT> { [ Alt_R, Alt_R ] };
- key <LWIN> { [ Meta_L ] };
- key <RWIN> { [ Meta_R ] };
-- modifier_map Mod1 { Alt_L, Alt_R };
- modifier_map Mod4 { <META>, Meta_L, Meta_R };
- };
-
- partial modifier_keys
- xkb_symbols "left_meta_win" {
-- key <LALT> { [ Alt_L, Alt_L ] };
- key <LWIN> { [ Meta_L ] };
-- modifier_map Mod1 { Alt_L };
- modifier_map Mod4 { <META>, Meta_L };
- };
-
Deleted: people/fabbione/nv-driver-backport/debian/patches/098_nv_xvideo_fullscreen_fix.diff
===================================================================
--- people/fabbione/nv-driver-backport/debian/patches/098_nv_xvideo_fullscreen_fix.diff 2004-09-22 08:50:51 UTC (rev 1849)
+++ people/fabbione/nv-driver-backport/debian/patches/098_nv_xvideo_fullscreen_fix.diff 2004-09-22 08:52:22 UTC (rev 1850)
@@ -1,18 +0,0 @@
-$Id$
-
-This patch by Mark Vojkovich via Eduard Bloch. Superseded by revision 1.37
-of nv_dac.c in upstream CVS.
-
-Fixes problem with corruption when using XVideo in fullscreen mode on a
-flat panel at high resolutions.
-
---- xc/programs/Xserver/hw/xfree86/drivers/nv/nv_dac.c~ 2003-10-21 16:32:26.000000000 -0500
-+++ xc/programs/Xserver/hw/xfree86/drivers/nv/nv_dac.c 2003-10-21 16:33:44.000000000 -0500
-@@ -75,6 +75,7 @@
- horizStart = horizTotal - 3;
- horizEnd = horizTotal - 2;
- horizBlankEnd = horizTotal + 4;
-+ horizTotal += 2;
- }
-
- pVga->CRTC[0x0] = Set8Bits(horizTotal);
Copied: people/fabbione/nv-driver-backport/debian/patches/099z_xkb_fix_rules_xfree86.diff (from rev 1848, trunk/debian/patches/099z_xkb_fix_rules_xfree86.diff)
Property changes on: people/fabbione/nv-driver-backport/debian/patches/099z_xkb_fix_rules_xfree86.diff
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: people/fabbione/nv-driver-backport/debian/po/ca.po
===================================================================
--- people/fabbione/nv-driver-backport/debian/po/ca.po 2004-09-22 08:50:51 UTC (rev 1849)
+++ people/fabbione/nv-driver-backport/debian/po/ca.po 2004-09-22 08:52:22 UTC (rev 1850)
@@ -26,7 +26,7 @@
msgstr ""
"Project-Id-Version: xfree86 4.3.0.dfsg.1-5\n"
"Report-Msgid-Bugs-To: debian-x@lists.debian.org\n"
-"POT-Creation-Date: 2004-08-30 07:42+0000\n"
+"POT-Creation-Date: 2004-09-22 01:37:39-0500\n"
"PO-Revision-Date: 2004-06-09 20:08+0200\n"
"Last-Translator: Ivan Vilata i Balaguer <ivan@selidor.net>\n"
"Language-Team: Catalan <debian-l10n-catalan@lists.debian.org>\n"
Modified: people/fabbione/nv-driver-backport/debian/po/cs.po
===================================================================
--- people/fabbione/nv-driver-backport/debian/po/cs.po 2004-09-22 08:50:51 UTC (rev 1849)
+++ people/fabbione/nv-driver-backport/debian/po/cs.po 2004-09-22 08:52:22 UTC (rev 1850)
@@ -26,7 +26,7 @@
msgstr ""
"Project-Id-Version: xfree86\n"
"Report-Msgid-Bugs-To: debian-x@lists.debian.org\n"
-"POT-Creation-Date: 2004-08-30 07:42+0000\n"
+"POT-Creation-Date: 2004-09-22 01:37:39-0500\n"
"PO-Revision-Date: 2004-05-29 17:03+0200\n"
"Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
"Language-Team: Czech <provoz@debian.cz>\n"
Modified: people/fabbione/nv-driver-backport/debian/po/da.po
===================================================================
--- people/fabbione/nv-driver-backport/debian/po/da.po 2004-09-22 08:50:51 UTC (rev 1849)
+++ people/fabbione/nv-driver-backport/debian/po/da.po 2004-09-22 08:52:22 UTC (rev 1850)
@@ -28,7 +28,7 @@
msgstr ""
"Project-Id-Version: xfree86_4.3.0-3_da\n"
"Report-Msgid-Bugs-To: debian-x@lists.debian.org\n"
-"POT-Creation-Date: 2004-08-30 07:42+0000\n"
+"POT-Creation-Date: 2004-09-22 01:37:39-0500\n"
"PO-Revision-Date: 2004-09-07 19:22+0200\n"
"Last-Translator: Claus Hindsgaul <claus_h@image.dk>\n"
"Language-Team: Danish <dansk@klid.dk>\n"
Modified: people/fabbione/nv-driver-backport/debian/po/de.po
===================================================================
--- people/fabbione/nv-driver-backport/debian/po/de.po 2004-09-22 08:50:51 UTC (rev 1849)
+++ people/fabbione/nv-driver-backport/debian/po/de.po 2004-09-22 08:52:22 UTC (rev 1850)
@@ -34,7 +34,7 @@
msgstr ""
"Project-Id-Version: de\n"
"Report-Msgid-Bugs-To: debian-x@lists.debian.org\n"
-"POT-Creation-Date: 2004-08-30 07:42+0000\n"
+"POT-Creation-Date: 2004-09-22 01:37:39-0500\n"
"PO-Revision-Date: 2004-07-24 15:03+0200\n"
"Last-Translator: Alwin Meschede <ameschede@gmx.de>\n"
"Language-Team: <gnome-de@gnome.org>\n"
Modified: people/fabbione/nv-driver-backport/debian/po/el.po
===================================================================
--- people/fabbione/nv-driver-backport/debian/po/el.po 2004-09-22 08:50:51 UTC (rev 1849)
+++ people/fabbione/nv-driver-backport/debian/po/el.po 2004-09-22 08:52:22 UTC (rev 1850)
@@ -26,7 +26,7 @@
msgstr ""
"Project-Id-Version: el\n"
"Report-Msgid-Bugs-To: debian-x@lists.debian.org\n"
-"POT-Creation-Date: 2004-08-30 07:42+0000\n"
+"POT-Creation-Date: 2004-09-22 01:37:39-0500\n"
"PO-Revision-Date: 2004-05-27 21:10EEST\n"
"Last-Translator: Konstantinos Margaritis <markos@debian.org>\n"
"Language-Team: Greek <debian-l10n-greek@lists.debian.org>\n"
Modified: people/fabbione/nv-driver-backport/debian/po/es.po
===================================================================
--- people/fabbione/nv-driver-backport/debian/po/es.po 2004-09-22 08:50:51 UTC (rev 1849)
+++ people/fabbione/nv-driver-backport/debian/po/es.po 2004-09-22 08:52:22 UTC (rev 1850)
@@ -28,7 +28,7 @@
msgstr ""
"Project-Id-Version: xfree86 4.2.1-6\n"
"Report-Msgid-Bugs-To: debian-x@lists.debian.org\n"
-"POT-Creation-Date: 2004-08-30 07:42+0000\n"
+"POT-Creation-Date: 2004-09-22 01:37:39-0500\n"
"PO-Revision-Date: 2003-03-24 20:21+0100\n"
"Last-Translator: Javier Fernandez-Sanguino Pe�jfs@debian.org>\n"
"Language-Team: ES <debian-l10n-spanish@lists.debian.org>\n"
Modified: people/fabbione/nv-driver-backport/debian/po/fr.po
===================================================================
--- people/fabbione/nv-driver-backport/debian/po/fr.po 2004-09-22 08:50:51 UTC (rev 1849)
+++ people/fabbione/nv-driver-backport/debian/po/fr.po 2004-09-22 08:52:22 UTC (rev 1850)
@@ -31,7 +31,7 @@
msgstr ""
"Project-Id-Version: xfree86 4.2.1-10\n"
"Report-Msgid-Bugs-To: debian-x@lists.debian.org\n"
-"POT-Creation-Date: 2004-08-30 07:42+0000\n"
+"POT-Creation-Date: 2004-09-22 01:37:39-0500\n"
"PO-Revision-Date: 2004-09-06 00:16+0200\n"
"Last-Translator: Christian Perrier <bubulle@debian.org>\n"
"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
Modified: people/fabbione/nv-driver-backport/debian/po/gl.po
===================================================================
--- people/fabbione/nv-driver-backport/debian/po/gl.po 2004-09-22 08:50:51 UTC (rev 1849)
+++ people/fabbione/nv-driver-backport/debian/po/gl.po 2004-09-22 08:52:22 UTC (rev 1850)
@@ -26,7 +26,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: debian-x@lists.debian.org\n"
-"POT-Creation-Date: 2004-08-30 07:42+0000\n"
+"POT-Creation-Date: 2004-09-22 01:37:39-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
Modified: people/fabbione/nv-driver-backport/debian/po/it.po
===================================================================
--- people/fabbione/nv-driver-backport/debian/po/it.po 2004-09-22 08:50:51 UTC (rev 1849)
+++ people/fabbione/nv-driver-backport/debian/po/it.po 2004-09-22 08:52:22 UTC (rev 1850)
@@ -29,7 +29,7 @@
msgstr ""
"Project-Id-Version: xfree86 4.3.0.dfsg.1\n"
"Report-Msgid-Bugs-To: debian-x@lists.debian.org\n"
-"POT-Creation-Date: 2004-08-30 07:42+0000\n"
+"POT-Creation-Date: 2004-09-22 01:37:39-0500\n"
"PO-Revision-Date: 2004-09-05 18:34+0200\n"
"Last-Translator: Danilo Piazzalunga <danilopiazza@libero.it>\n"
"Language-Team: Italian <tp@lists.linux.it>\n"
Modified: people/fabbione/nv-driver-backport/debian/po/ja.po
===================================================================
--- people/fabbione/nv-driver-backport/debian/po/ja.po 2004-09-22 08:50:51 UTC (rev 1849)
+++ people/fabbione/nv-driver-backport/debian/po/ja.po 2004-09-22 08:52:22 UTC (rev 1850)
@@ -29,8 +29,8 @@
msgstr ""
"Project-Id-Version: xfree86 4.3.0\n"
"Report-Msgid-Bugs-To: debian-x@lists.debian.org\n"
-"POT-Creation-Date: 2004-08-30 07:42+0000\n"
-"PO-Revision-Date: 2004-06-25 09:21+0900\n"
+"POT-Creation-Date: 2004-09-22 01:37:39-0500\n"
+"PO-Revision-Date: 2004-09-18 15:41+0900\n"
"Last-Translator: Kenshi Muto <kmuto@debian.org> and ISHIKAWA Mutsumi "
"<ishikawa@debian.org>\n"
"Language-Team: Japanese <debian-japanese@lists.debian.org>\n"
@@ -42,7 +42,7 @@
#. Description
#: ../libx11-6.templates:4
msgid "Migrate XKB configuration directory?"
-msgstr ""
+msgstr "XKB ���ǥ��쥯�ȥ��ܹԤ��ޤ���?"
#. Type: boolean
#. Description
@@ -52,6 +52,8 @@
"the X KEYBOARD Extension (XKB) is stored has been changed from /usr/X11R6/"
"lib/X11/xkb to /etc/X11/xkb."
msgstr ""
+"X KEYBOARD Extension (XKB) ����� (�����ܡ��ɤΥǡ�������γ������
+"�ǥ��쥯�ȥ���/usr/X11R6/lib/X11/xkb ����etc/X11/xkb ��ѹ�����������"
#. Type: boolean
#. Description
@@ -60,6 +62,9 @@
"Your system is using the old location, and some programs, such as those from "
"old or unofficial Debian packages, may continue to install files there."
msgstr ""
+"���ʤ��Υ����ƥ������θŤ����ȡ��Ť����뤤������Debian �ѥå�������
+"�褦�ʤ����Ĥ��Υץ�����äƤ��ꡢ�ե����������˥��ȡ��뤷���ޤ�
+"�ˤ��Ƥ����Ƥ⤫�ޤ��ޤ���
#. Type: boolean
#. Description
@@ -71,12 +76,16 @@
"files from the old location. A symbolic link from the old location to the "
"new one will be created to prevent legacy applications from breaking."
msgstr ""
+"�����ƥ� XKB ���ե�������ưŪ�˸Ť������鿷�������˰ܹԤ��ޤ���? ��"
+"�������ˤ�����̾���Ĵ��ե������Хå����åפ��졢�Ť�������"
+"�ե���������֤��������ޤ������Υ��ץꥱ����������������뤿"
+"�ᡢ�Ť������鿷�������ؤΥ����������������������"
#. Type: boolean
#. Description
#: ../libxt6.templates:4
msgid "Migrate Xt application defaults directory?"
-msgstr ""
+msgstr "Xft ���ץꥱ�������Υǥե����ǥ��쥯�ȥ��ܹԤ��ޤ���?"
#. Type: boolean
#. Description
@@ -86,6 +95,9 @@
"based on the X Toolkit Intrinsics (Xt) are stored has been changed from /usr/"
"X11R6/lib/X11/app-defaults to /etc/X11/app-defaults."
msgstr ""
+"X Toolkit Intrinsics (Xt) �١�����X Window System ���饤����ץ����Υ�"
+"�ץꥱ�������Υǥե������γ�����Υǥ��쥯�ȥ���/usr/X11R6/lib/X11/"
+"app-defaults ����etc/X11/app-defaults ��ѹ�����������"
#. Type: boolean
#. Description
@@ -97,6 +109,10 @@
"files from the old location. A symbolic link from the old location to the "
"new one will be created to prevent legacy applications from breaking."
msgstr ""
+"�����ƥ� app-defaults �ե�������ưŪ�˸Ť������鿷�������˰ܹԤ��ޤ�"
+"��? ���������ˤ�����̾���Ĵ��ե������Хå����åפ��졢�Ť���"
+"�����ե���������֤��������ޤ������Υ��ץꥱ���������������"
+"�뤿�ᡢ�Ť������鿷�������ؤΥ����������������������"
#. Type: select
#. Description
Modified: people/fabbione/nv-driver-backport/debian/po/nl.po
===================================================================
--- people/fabbione/nv-driver-backport/debian/po/nl.po 2004-09-22 08:50:51 UTC (rev 1849)
+++ people/fabbione/nv-driver-backport/debian/po/nl.po 2004-09-22 08:52:22 UTC (rev 1850)
@@ -28,7 +28,7 @@
msgstr ""
"Project-Id-Version: xfree86\n"
"Report-Msgid-Bugs-To: debian-x@lists.debian.org\n"
-"POT-Creation-Date: 2004-08-30 07:42+0000\n"
+"POT-Creation-Date: 2004-09-22 01:37:39-0500\n"
"PO-Revision-Date: 2004-07-04 20:22-0500\n"
"Last-Translator: Bart Cornelis <cobaco@linux.be>\n"
"Language-Team: debian-l10n-dutch <debian-l10n-dutch@lists.debian.org>\n"
Modified: people/fabbione/nv-driver-backport/debian/po/pl.po
===================================================================
--- people/fabbione/nv-driver-backport/debian/po/pl.po 2004-09-22 08:50:51 UTC (rev 1849)
+++ people/fabbione/nv-driver-backport/debian/po/pl.po 2004-09-22 08:52:22 UTC (rev 1850)
@@ -26,7 +26,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: debian-x@lists.debian.org\n"
-"POT-Creation-Date: 2004-08-30 07:42+0000\n"
+"POT-Creation-Date: 2004-09-22 01:37:39-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
Modified: people/fabbione/nv-driver-backport/debian/po/pt_BR.po
===================================================================
--- people/fabbione/nv-driver-backport/debian/po/pt_BR.po 2004-09-22 08:50:51 UTC (rev 1849)
+++ people/fabbione/nv-driver-backport/debian/po/pt_BR.po 2004-09-22 08:52:22 UTC (rev 1850)
@@ -28,7 +28,7 @@
msgstr ""
"Project-Id-Version: xfree86\n"
"Report-Msgid-Bugs-To: debian-x@lists.debian.org\n"
-"POT-Creation-Date: 2004-08-30 07:42+0000\n"
+"POT-Creation-Date: 2004-09-22 01:37:39-0500\n"
"PO-Revision-Date: 2004-09-01 18:09-0300\n"
"Last-Translator: Andr�u�Lopes <andrelop@debian.org>\n"
"Language-Team: Debian-BR Project <debian-l10n-portuguese@lists.debian.org>\n"
@@ -51,8 +51,8 @@
"lib/X11/xkb to /etc/X11/xkb."
msgstr ""
"O diret� onde as informa�s de configura� (inclu�o dados do teclado) "
-"para a Extens�de Teclados X (XKB) s�armazenadas mudou de /usr/X11R6/"
-"lib/X11/xkb para /etc/X11/xkb."
+"para a Extens�de Teclados X (XKB) s�armazenadas mudou de /usr/X11R6/lib/"
+"X11/xkb para /etc/X11/xkb."
#. Type: boolean
#. Description
@@ -61,9 +61,9 @@
"Your system is using the old location, and some programs, such as those from "
"old or unofficial Debian packages, may continue to install files there."
msgstr ""
-"Seu sistema est�sando o local antigo e alguns programas, como aqueles "
-"de pacotes Debian antigos ou n�oficiais, podem continuar a instalar "
-"arquivos no local antigo."
+"Seu sistema est�sando o local antigo e alguns programas, como aqueles de "
+"pacotes Debian antigos ou n�oficiais, podem continuar a instalar arquivos "
+"no local antigo."
#. Type: boolean
#. Description
@@ -77,11 +77,10 @@
msgstr ""
"Voc�ostaria que os arquivos de configura� XKB no sistema fossem "
"automaticamente migrados do local antigo para o novo ? Uma c� de "
-"seguran�(backup) de todos os arquivos existentes no novo local que "
-"possuam os mesmos nomes ser�eita e os arquivos ser�substitu�s "
-"pelos arquivos do local antigo. Uma liga� simb�a do local antigo "
-"para o novo local ser�riada para evitar que aplica�s de legado "
-"parem de funcionar."
+"seguran�(backup) de todos os arquivos existentes no novo local que possuam "
+"os mesmos nomes ser�eita e os arquivos ser�substitu�s pelos arquivos "
+"do local antigo. Uma liga� simb�a do local antigo para o novo local "
+"ser�riada para evitar que aplica�s de legado parem de funcionar."
#. Type: boolean
#. Description
@@ -99,8 +98,8 @@
msgstr ""
"O diret� onde os padr�de aplica�s para os programas clientes do "
"Sistema de Janelas X baseados no Kit de Ferramentas Intr�icas (Xt) s�"
-"armazenados mudou de /usr/X11R6/lib/X11/app-defaults para "
-"/etc/X11/app-defaults."
+"armazenados mudou de /usr/X11R6/lib/X11/app-defaults para /etc/X11/app-"
+"defaults."
#. Type: boolean
#. Description
@@ -113,12 +112,12 @@
"new one will be created to prevent legacy applications from breaking."
msgstr ""
"Voc�ostaria que os arquivos de padr�de aplica�s existentes no "
-"sistemas fossem automaticamente migrados do local antigo para o novo "
-"local ? Uma c� de seguran�(backup) de todos os arquivos existentes "
-"no novo local que possuam os mesmos nomes ser�eita e os arquivos ser�"
-"substitu�s pelos arquivos do local antigo. Uma liga� simb�a do "
-"local antigo para o novo local ser�riada para evitar que aplica�s "
-"de legado parem de funcionar."
+"sistemas fossem automaticamente migrados do local antigo para o novo local ? "
+"Uma c� de seguran�(backup) de todos os arquivos existentes no novo "
+"local que possuam os mesmos nomes ser�eita e os arquivos ser�"
+"substitu�s pelos arquivos do local antigo. Uma liga� simb�a do local "
+"antigo para o novo local ser�riada para evitar que aplica�s de legado "
+"parem de funcionar."
#. Type: select
#. Description
@@ -416,9 +415,9 @@
"Diversas placas de v�o foram detectadas e diferentes servidores X s�"
"necess�os para suportar os v�os dispositivos. Por esse motivo, n��
"poss�l selecionar automaticamente um servidor X padr� Por favor, "
-"configure o dispositivo que ir�ervir como o \"dispositivo principal\" "
-"de seu computador; este �eralmente a placa de v�o e monitor no "
-"qual o computador exibe seus dados quando o mesmo inicia."
+"configure o dispositivo que ir�ervir como o \"dispositivo principal\" de "
+"seu computador; este �eralmente a placa de v�o e monitor no qual o "
+"computador exibe seus dados quando o mesmo inicia."
#. Type: select
#. Description
Modified: people/fabbione/nv-driver-backport/debian/po/ru.po
===================================================================
--- people/fabbione/nv-driver-backport/debian/po/ru.po 2004-09-22 08:50:51 UTC (rev 1849)
+++ people/fabbione/nv-driver-backport/debian/po/ru.po 2004-09-22 08:52:22 UTC (rev 1850)
@@ -27,7 +27,7 @@
msgstr ""
"Project-Id-Version: xfree86_4.2.1-11\n"
"Report-Msgid-Bugs-To: debian-x@lists.debian.org\n"
-"POT-Creation-Date: 2004-08-30 07:42+0000\n"
+"POT-Creation-Date: 2004-09-22 01:37:39-0500\n"
"PO-Revision-Date: 2003-10-05 16:57+0600\n"
"Last-Translator: Ilgiz Kalmetev <translator@ilgiz.pp.ru>\n"
"Language-Team: russian <debian-russian@lists.debian.org>\n"
Modified: people/fabbione/nv-driver-backport/debian/po/sv.po
===================================================================
--- people/fabbione/nv-driver-backport/debian/po/sv.po 2004-09-22 08:50:51 UTC (rev 1849)
+++ people/fabbione/nv-driver-backport/debian/po/sv.po 2004-09-22 08:52:22 UTC (rev 1850)
@@ -28,7 +28,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: debian-x@lists.debian.org\n"
-"POT-Creation-Date: 2004-08-30 07:42+0000\n"
+"POT-Creation-Date: 2004-09-22 01:37:39-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
Modified: people/fabbione/nv-driver-backport/debian/po/templates.pot
===================================================================
--- people/fabbione/nv-driver-backport/debian/po/templates.pot 2004-09-22 08:50:51 UTC (rev 1849)
+++ people/fabbione/nv-driver-backport/debian/po/templates.pot 2004-09-22 08:52:22 UTC (rev 1850)
@@ -14,21 +14,17 @@
# info -n '(gettext)PO Files'
# info -n '(gettext)Header Entry'
#
-# Some information specific to po-debconf are available at
+# Some information specific to po-debconf is available at
# /usr/share/doc/po-debconf/README-trans
# or http://www.debian.org/intl/l10n/po-debconf/README-trans
#
# Developers do not need to manually edit POT or PO files.
#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: 4.3.0.dfsg.1-6+SVN\n"
+"Project-Id-Version: 4.3.0.dfsg.1-7+SVN\n"
"Report-Msgid-Bugs-To: debian-x@lists.debian.org\n"
-"POT-Creation-Date: 2004-08-30 07:42+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"POT-Creation-Date: 2004-09-22 01:37:39-0500\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
Modified: people/fabbione/nv-driver-backport/debian/po/tr.po
===================================================================
--- people/fabbione/nv-driver-backport/debian/po/tr.po 2004-09-22 08:50:51 UTC (rev 1849)
+++ people/fabbione/nv-driver-backport/debian/po/tr.po 2004-09-22 08:52:22 UTC (rev 1850)
@@ -27,7 +27,7 @@
msgstr ""
"Project-Id-Version: xserver-xfree86\n"
"Report-Msgid-Bugs-To: debian-x@lists.debian.org\n"
-"POT-Creation-Date: 2004-08-30 07:42+0000\n"
+"POT-Creation-Date: 2004-09-22 01:37:39-0500\n"
"PO-Revision-Date: 2004-06-26 16:54+0300\n"
"Last-Translator: Osman Yüksel <yuxel@sonsuzdongu.com>\n"
"Language-Team: Turkish <debian-l10n-turkish@lists.debian.org>\n"
Reply to: