Merging XORG-CURRENT into trunk

author: Egbert Eich <eich@suse.de> 2004-04-23 19:54:30 +0000
committer: Egbert Eich <eich@suse.de> 2004-04-23 19:54:30 +0000
commit: 2fb588620030ad393f8500d60e16144d59e4effe (patch)
tree: 07262cbe15a40e5aeae54f62751260f83243ab79 /hw/darwin
parent: 0664db19bf37f9dd69cca6adff4e238e310c3092 (diff)
97 files changed, 808 insertions, 501 deletions
diff --git a/hw/darwin/XDarwin.man b/hw/darwin/XDarwin.man
index a718e41ce..eb1b9dcb8 100644
--- a/hw/darwin/XDarwin.man
+++ b/hw/darwin/XDarwin.man
@@ -1,4 +1,4 @@
-.\" $XFree86: xc/programs/Xserver/hw/darwin/XDarwin.man,v 1.4 2002/01/09 18:01:58 torrey Exp $
+.\" $XFree86: xc/programs/Xserver/hw/darwin/XDarwin.man,v 1.3 2001/09/23 23:02:37 torrey Exp $
 .\"
 .TH XDARWIN 1 __vendorversion__
 .SH NAME
@@ -10,7 +10,7 @@ XDarwin \- X window system server for Darwin operating system
 #ifdef DARWIN_WITH_QUARTZ
 .I XDarwin
 is the X window server for Mac OS X and the Darwin operating system
-provided by the XFree86 Project.
+provided by the X.Org Foundation.
 .I XDarwin
 can run in three different modes. On Mac OS X,
 .I XDarwin
@@ -51,7 +51,7 @@ handles the desktop background.
 #else
 .I XDarwin
 is the X window server for Mac OS X and the Darwin operating system
-provided by the XFree86 Project. This version of
+provided by the X.Org Foundation. This version of
 .I XDarwin
 can only be started from the Darwin text console. The Mac OS X Aqua GUI, if
 present, must be shut down.
@@ -147,7 +147,7 @@ Print out the server version and patchlevel.
 Same as \fB\-showconfig\fP.
 .SH "SEE ALSO"
 .PP
-X(__miscmansuffix__), XFree86(1), Xserver(1), xdm(1), xinit(1)
+X(__miscmansuffix__), Xorg(1), Xserver(1), xdm(1), xinit(1)
 .SH BUGS
 .I XDarwin
 and this man page still have many limitations. Some of the more obvious
diff --git a/hw/darwin/bundle/Dutch.lproj/Credits.rtf b/hw/darwin/bundle/Dutch.lproj/Credits.rtf
index 56038582a..5858e5933 100644
--- a/hw/darwin/bundle/Dutch.lproj/Credits.rtf
+++ b/hw/darwin/bundle/Dutch.lproj/Credits.rtf
@@ -5,10 +5,20 @@
 \vieww9000\viewh9000\viewkind0
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
 
-\f0\fs24 \cf0 This product  includes software developed by The XFree86 Project, Inc  (http://www.xfree86.org/) and its contributors. The following people contributed to Darwin/Mac OS X support.\
+\f0\fs24 \cf0 This product includes software developed by The XFree86 Project, Inc  (http://www.xfree86.org/) and its contributors. The following people contributed to Darwin/Mac OS X support.\
 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
 
+\f1\b \cf0 Contributors to Xorg Foundation Release:
+\f0\b0 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
+\cf0 Kaleb KEITHLEY\
+     
+\f2\i Working left and right Ctrl, Alt (Option), Meta (Command) and Shift keys.
+\f0\i0 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
+
+\f1\b \cf0 \
 \f1\b \cf0 Contributors to XFree86 4.4:
 \f0\b0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
diff --git a/hw/darwin/bundle/Dutch.lproj/MainMenu.nib/objects.nib b/hw/darwin/bundle/Dutch.lproj/MainMenu.nib/objects.nib
index 438e26b3b..8e9224cb6 100644
--- a/hw/darwin/bundle/Dutch.lproj/MainMenu.nib/objects.nib
+++ b/hw/darwin/bundle/Dutch.lproj/MainMenu.nib/objects.nib
diff --git a/hw/darwin/bundle/Dutch.lproj/XDarwinHelp.html.cpp b/hw/darwin/bundle/Dutch.lproj/XDarwinHelp.html.cpp
index e7ca52c2c..1113b8ae6 100644
--- a/hw/darwin/bundle/Dutch.lproj/XDarwinHelp.html.cpp
+++ b/hw/darwin/bundle/Dutch.lproj/XDarwinHelp.html.cpp
@@ -1 +1,103 @@
-<!-- $XFree86: xc/programs/Xserver/hw/darwin/bundle/Dutch.lproj/XDarwinHelp.html.cpp,v 1.2 2001/11/19 01:21:32 torrey Exp $ -->
-#include "xf86Version.h"
-#ifndef PRE_RELEASE
-#define PRE_RELEASE XF86_VERSION_SNAP
-#endif
-<html>
-<head>
-<title>XFree86 voor Mac OS X</title>
-</head>
-<body>
-<center>
-    <h1>XFree86 voor Darwin en Mac OS X</h1>
-    XFree86 XF86_VERSION<br>
-    Release Date: XF86_REL_DATE
-</center>
-<h2>Inhoud</h2>
-<ol>
-    <li><A HREF="#notice">Belangrijke Informatie</A></li>
-    <li><A HREF="#usage">Gebruik</A></li>
-    <li><A HREF="#path">Instellen van het Path</A></li>
-    <li><A HREF="#prefs">Voorkeursinstellingen</A></li>
-    <li><A HREF="#license">Licentie</A></li>
-</ol>
-<center>
-    <h2><a NAME="notice">Belangrijke Informatie</a></h2>
-</center>
-<blockquote>
-#if PRE_RELEASE
-Dit is een pre-release van XFree86, waarvoor geen ondersteuning beschikbaar is.  Rapporteren van bugs en aanleveren van patches kan op de <A HREF="http://sourceforge.net/projects/xonx/">XonX project pagina</A> bij SourceForge.  Kijk alvorens een bug te rapporteren in een pre-release eerst of een nieuwe versie beschikbaar is bij <A HREF="http://sourceforge.net/projects/xonx/">XonX</A> of in de <A HREF="http://www.XFree86.Org/cvs">XFree86 CVS repository</A>.
-#else
-Als de server ouder is dan 6-12 maanden, of als uw hardware nieuwer is dan de bovenstaande datum, kijk dan of een nieuwe versie beschikbaar is voor u een probleem aanmeldt.  Rapporteren van bugs en aanleveren van patches kan op de <A HREF="http://sourceforge.net/projects/xonx/">XonX project pagina</A> bij SourceForge.
-#endif
-</blockquote>
-<blockquote>
-Deze software is beschikbaar gesteld onder de voorwaarden van de <A HREF="#license">MIT X11 / X Consortium Licentie</A> en is beschikbaar 'AS IS',zonder enige garantie. Lees s.v.p. de <A HREF="#license">Licentie</A> voor gebruik.</blockquote>
-<h2><a NAME="usage">Gebruik</a></h2>
-<p>XFree86 is een open-source uitvoering van het <a HREF="http://www.x.org/">X Window Systeem</a>, verzorgd door <a HREF="http://www.XFree86.Org/">XFree86 Project, Inc.</a>, die vrij verspreid mag worden. De X window server voor Darwin en Mac OS X verzorgd door XFree86 heet XDarwin.  XDarwin werkt op Mac OS X in schermvullende of rootless modus.</p>
-<p>Het X window systeem in schermvullende modus neemt het hele beeldscherm in beslag. U schakelt terug naar de Mac OS X desktop door de toesten Command-Option-A in te drukken. Deze toetsencombinatie kunt u veranderen in de Voorkeuren. Op de Mac OS X desktop klikt u op de XDarwin icoon in de Dock om weer naar het X window systeem te schakelen.  (In de Voorkeuren kunt er voor kiezen om een apart XDarwin schakelpaneel te gebruiken op de Mac OS X desktop.)</p>
-<p>In rootless modus verschijnen het X window systeem en Aqua (de Mac OS X desktop) tegelijk op het scherm. Het achtergrondscherm van X11, waarbinnen alle X11 vensters vallen, is net zo groot als het gehele scherm, maar het achtergrondscherm zelf is onzichtbaar.</p>
-<h3>Meerknopsmuis emulatie</h3>
-<p>Voor veel X11 programma's hebt u een 3-knops muis nodig.  Met een 1-knops muis kunt u een 3-knops muis nabootsen door een toets in te drukken terwijl u klikt met de muis.  Het instellen hiervan kan bij Voorkeuren, "Meerknopsmuis emulatie" in "Algemeen".  Emulatie is standaard ingeschakeld: ingedrukt houden van de "command" toets terwijl u klikt emuleert knop 2, ingedrukt houden van "option" emuleert knop 3.  Deze toetsen kunt u dus wijzigen in de Voorkeuren.  Let op: als u xmodmap gebruikt om de indeling van het toetsenbord te wijzigen, moet u toch de oorspronkelijke toetsen op het toetsenbord gebruiken voor deze functie.</p>
-<h2><a NAME="path">Instellen van het Path</a></h2>
-<p>Het path is de lijst van directories waarin gezocht wordt naar commando's.  De X11 commando's staan in de directory <code>/usr/X11R6/bin</code>, die dus aan uw path moet worden toegevoegd.  XDarwin doet dit automatisch voor u en kan extra directories toevoegen waarin u commando's hebt ge&iuml;nstalleerd.</p>
-<p>Ervaren gebruikers zullen het path al correct hebben ingesteld in de configuratiebestanden voor hun shell.  In dat geval kunt u XDarwin via de Voorkeuren vertellen het path niet te wijzigen.  XDarwin start de eerste X11 clients binnen de standaard login shell van de gebruiker (bij de Voorkeuren kunt u een afwijkende shell opgeven).  Het instellen van het path is afhankelijk van de shell.  Zie hiervoor de man pages voor de shell.</p>
-<p>Het kan handig zijn de man pages voor XFree86 toe te voegen aan de lijst waarin gezocht wordt als u documentatie opvraagt.  De manualpages voor X11 staan in <code>/usr/X11R6/man</code> en de <code>MANPATH</code> environment variable bevat de lijst van directories waarin naar documentatie wordt gezocht.</p>
-<h2><a NAME="prefs">Voorkeursinstellingen</a></h2>
-<p>Een aantal instellingen kan worden gewijzigd door "Voorkeuren..." te kiezen in het "XDarwin" menu.  Wijzigingen van de instellingen genoemd onder "Start" gaan pas in als u XDarwin opnieuw hebt gestart.  Een wijziging van de overige instellingen is direct effectief.  Hier onder vindt u de verschillende mogelijkheden beschreven:</p>
-<h3>Algemeen</h3>
-<ul>
-    <li><b>Gebruik systeempiep voor X11:</b> Als u dit inschakelt wordt het Mac OS X  waarschuwingssignaal ook gebruikt door X11, anders gebruikt X11 een simpele pieptoon (dit is de standaardinstelling).</li>
-    <li><b>Wijzigen muis-versnelling door X11 mogelijk:</b> In een standaard X window systeem kan de window manager de muis-versnelling aanpassen.  Dit kan verwarrend zijn omdat de snelheid onder X11 dan verschillend kan zijn van de snelheid die u in Mac OS X bij Systeemvoorkeuren hebt ingesteld.  Om verwarring te voorkomen is de standaardinstelling dat X11 de versnelling niet kan wijzigen.</li>
-    <li><b>Meerknopsmuis emulatie:</b> Dit is hierboven beschreven bij <a HREF="#usage">Gebruik</a>.  Als emulatie is ingeschakeld moet u de gekozen toetsen ingedrukt houden terwijl u met de muis klikt om de tweede en derde muisknop na te bootsen.</li>
-</ul>
-<h3>Start</h3>
-<ul>
-    <li><b>Standaard modus:</b> Hier kiest u de standaard scherm-modus: schermvullend of rootless (hierboven beschreven bij <a HREF="#usage">Gebruik</a>).  U kunt ook kiezen tijdens het starten van XDarwin, zie de optie hieronder.</li>
-    <li><b>Kies scherm-modus tijdens start:</b> Dit is standaard ingeschakeld zodat u tijdens het starten van XDarwin kunt kiezen tussen schermvullend en rootless scherm-modus.  Als u dit uitschakelt start XDarwin in de standaard modus zonder u iets te vragen.</li>
-    <li><b>X11 scherm nummer:</b> Met X11 kunnen meerdere schermen worden aangestuurd door verschillende X servers op dezelfde computer.  Als u meerdere X servers tegelijk wilt gebruiken stelt u hier het scherm nummer in dat door XDarwin wordt gebruikt.</li>
-    <li><b>Xinerama multi-monitor ondersteuning mogelijk:</b> XDarwin ondersteunt het gebruik van meerdere monitoren met Xinerama, waarbij elke monitor wordt gezien als deel van &eacute;&eacute;n groot rechthoekig scherm.  U kunt Xinerama hier uitschakelen, maar XDarwin werkt op dit moment zonder Xinerama niet goed met meerdere monitoren.  Als u maar 1 monitor gebruikt is deze instelling automatisch uitgeschakeld.</li>
-    <li><b>Toetsenbordindeling-bestand:</b> Een toetsenbordindeling-bestand wordt bij het starten geladen en omgezet naar een X11 toetsenbordindeling.  Voor verschillende talen vindt u toetsenbordindelingen in de directory <code>/System/Library/Keyboards</code>.</li>
-    <li><b>Bij starten eerste X11 clients:</b> Als XDarwin start, wordt  <code>xinit</code> uitgevoerd om de X window manager en andere X clients te starten (zie "<code>man xinit</code>").  Voordat XDarwin <code>xinit</code> uitvoert voegt het de opgegeven directories toe aan het path.  Standaard wordt alleen <code>/usr/X11R6/bin</code> toegevoegd.  U kunt meerdere directories opgeven, gescheiden door een dubbelepunt.  X clients worden gestart met de standaard login shell van de gebruiker met gebruik van de configuratiebestanden voor die shell.  U kunt een afwijkende shell opgeven.</li>
-</ul>
-<h3>Schermvullend</h3>
-<ul>
-    <li><b>Toetscombinatie knop:</b> Klik op deze knop om de toetscombinatie te wijzigen waarmee u tussen de Mac OS X desktop en X11 schakelt.  Als toetscombinatie kunt u elke combinatie gebruiken van de shift, control, command en option toetsen samen met &eacute;&eacute;n normale toets.</li>
-    <li><b>Klikken op icoon in Dock schakelt naar X11:</b> Hiermee is een klik op de XDarwin icoon in de Dock voldoende om naar X11 te schakelen.  In sommige versies van Mac OS X verdwijnt soms de cursor als u deze mogelijkheid gebruikt en daarna terugkeert naar de Mac OS X desktop.</li>
-    <li><b>Toon help bij schermvullend starten:</b> Hiermee wordt een inleidend scherm getoond als XDarwin schermvullend start.</li>
-    <li><b>Kleurdiepte:</b> In de schermvullende modus kan X11 een andere kleurdiepte gebruiken dan Aqua (en de Mac OS X desktop).  Als u "Huidig" kiest, neemt XDarwin bij het starten de kleurdiepte over van Aqua.  U kunt ook kiezen voor 8, 15 of 24 bits.</li>
-</ul>
-<h2><a NAME="license">Licentie</a></h2>
-The XFree86 Project is committed to providing freely redistributable binary and source releases. The main license we use is one based on the traditional MIT X11 / X Consortium License, which does not impose any conditions on modification or redistribution of source code or binaries other than requiring that copyright/license notices are left intact. For more information and additional copyright/licensing notices covering some sections of the code, please see the <A HREF="http://www.xfree86.org/legal/licence.html">XFree86
-License page</A>.
-<H3><A NAME="3"></A>X Consortium License</H3>
-<p>Copyright (C) 1996 X Consortium</p>
-<p>Permission is hereby granted, free of charge, to any person obtaining a 
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without
-limitation the rights to use, copy, modify, merge, publish, distribute,
-sublicense, and/or sell copies of the Software, and to permit persons to
-whom the Software is furnished to do so, subject to the following conditions:</p>
-<p>The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.</p>
-<p>THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT
-SHALL THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-IN THE SOFTWARE.</p>
-<p>Except as contained in this notice, the name of the X Consortium shall
-not be used in advertising or otherwise to promote the sale, use or
-other dealings in this Software without prior written authorization from
-the X Consortium.</p>
-<p>X Window System is a trademark of X Consortium, Inc.</p>
-</body>
-</html>
-\ No newline at end of file
+<!-- $XFree86: xc/programs/Xserver/hw/darwin/bundle/English.lproj/XDarwinHelp.html.cpp,v 1.2 2001/11/04 07:02:28 torrey Exp $ -->
+
+<html>
+<head>
+<title>XDarwin Help</title>
+</head>
+<body>
+<center>
+    <h1>XDarwin X Server for Mac OS X</h1>
+    X_VENDOR_NAME X_VERSION<br>
+    Release Date: X_REL_DATE
+</center>
+<h2>Inhoud</h2>
+<ol>
+    <li><A HREF="#notice">Belangrijke Informatie</A></li>
+    <li><A HREF="#usage">Gebruik</A></li>
+    <li><A HREF="#path">Instellen van het Path</A></li>
+    <li><A HREF="#prefs">Voorkeursinstellingen</A></li>
+    <li><A HREF="#license">Licentie</A></li>
+</ol>
+<center>
+    <h2><a NAME="notice">Belangrijke Informatie</a></h2>
+</center>
+<blockquote>
+#if X_PRE_RELEASE
+Dit is een pre-release van XDarwin, waarvoor geen ondersteuning beschikbaar is.  Rapporteren van bugs en aanleveren van patches kan op de <A HREF="http://sourceforge.net/projects/xonx/">XonX project pagina</A> bij SourceForge.  Kijk alvorens een bug te rapporteren in een pre-release eerst of een nieuwe versie beschikbaar is bij <A HREF="http://sourceforge.net/projects/xonx/">XonX</A> of de X_VENDOR_LINK.
+#else
+Als de server ouder is dan 6-12 maanden, of als uw hardware nieuwer is dan de bovenstaande datum, kijk dan of een nieuwe versie beschikbaar is voor u een probleem aanmeldt.  Rapporteren van bugs en aanleveren van patches kan op de <A HREF="http://sourceforge.net/projects/xonx/">XonX project pagina</A> bij SourceForge.
+#endif
+</blockquote>
+<blockquote>
+Deze software is beschikbaar gesteld onder de voorwaarden van de <A HREF="#license">MIT X11 / X Consortium Licentie</A> en is beschikbaar 'AS IS',zonder enige garantie. Lees s.v.p. de <A HREF="#license">Licentie</A> voor gebruik.</blockquote>
+
+<h2><a NAME="usage">Gebruik</a></h2>
+<p>XDarwin is een open-source X server van het <a HREF="http://www.x.org/">X Window Systeem</a>. This version of XDarwin was produced by the X_VENDOR_LINK.  XDarwin werkt op Mac OS X in schermvullende of rootless modus.</p>
+<p>Het X window systeem in schermvullende modus neemt het hele beeldscherm in beslag. U schakelt terug naar de Mac OS X desktop door de toesten Command-Option-A in te drukken. Deze toetsencombinatie kunt u veranderen in de Voorkeuren. Op de Mac OS X desktop klikt u op de XDarwin icoon in de Dock om weer naar het X window systeem te schakelen.  (In de Voorkeuren kunt er voor kiezen om een apart XDarwin schakelpaneel te gebruiken op de Mac OS X desktop.)</p>
+<p>In rootless modus verschijnen het X window systeem en Aqua (de Mac OS X desktop) tegelijk op het scherm. Het achtergrondscherm van X11, waarbinnen alle X11 vensters vallen, is net zo groot als het gehele scherm, maar het achtergrondscherm zelf is onzichtbaar.</p>
+
+<h3>Meerknopsmuis emulatie</h3>
+<p>Voor veel X11 programma's hebt u een 3-knops muis nodig.  Met een 1-knops muis kunt u een 3-knops muis nabootsen door een toets in te drukken terwijl u klikt met de muis.  Het instellen hiervan kan bij Voorkeuren, "Meerknopsmuis emulatie" in "Algemeen".  Emulatie is standaard ingeschakeld: ingedrukt houden van de "command" toets terwijl u klikt emuleert knop 2, ingedrukt houden van "option" emuleert knop 3.  Deze toetsen kunt u dus wijzigen in de Voorkeuren.  Let op: als u xmodmap gebruikt om de indeling van het toetsenbord te wijzigen, moet u toch de oorspronkelijke toetsen op het toetsenbord gebruiken voor deze functie.</p>
+
+<h2><a NAME="path">Instellen van het Path</a></h2>
+<p>Het path is de lijst van directories waarin gezocht wordt naar commando's.  De X11 commando's staan in de directory <code>/usr/X11R6/bin</code>, die dus aan uw path moet worden toegevoegd.  XDarwin doet dit automatisch voor u en kan extra directories toevoegen waarin u commando's hebt ge&iuml;nstalleerd.</p>
+
+<p>Ervaren gebruikers zullen het path al correct hebben ingesteld in de configuratiebestanden voor hun shell.  In dat geval kunt u XDarwin via de Voorkeuren vertellen het path niet te wijzigen.  XDarwin start de eerste X11 clients binnen de standaard login shell van de gebruiker (bij de Voorkeuren kunt u een afwijkende shell opgeven).  Het instellen van het path is afhankelijk van de shell.  Zie hiervoor de man pages voor de shell.</p>
+
+<p>Het kan handig zijn de manualpages voor X11 toe te voegen aan de lijst waarin gezocht wordt als u documentatie opvraagt.  De manualpages voor X11 staan in <code>/usr/X11R6/man</code> en de <code>MANPATH</code> environment variable bevat de lijst van directories waarin naar documentatie wordt gezocht.</p>
+
+<h2><a NAME="prefs">Voorkeursinstellingen</a></h2>
+<p>Een aantal instellingen kan worden gewijzigd door "Voorkeuren..." te kiezen in het "XDarwin" menu.  Wijzigingen van de instellingen genoemd onder "Start" gaan pas in als u XDarwin opnieuw hebt gestart.  Een wijziging van de overige instellingen is direct effectief.  Hier onder vindt u de verschillende mogelijkheden beschreven:</p>
+
+<h3>Algemeen</h3>
+<ul>
+    <li><b>Gebruik systeempiep voor X11:</b> Als u dit inschakelt wordt het Mac OS X  waarschuwingssignaal ook gebruikt door X11, anders gebruikt X11 een simpele pieptoon (dit is de standaardinstelling).</li>
+    <li><b>Wijzigen muis-versnelling door X11 mogelijk:</b> In een standaard X window systeem kan de window manager de muis-versnelling aanpassen.  Dit kan verwarrend zijn omdat de snelheid onder X11 dan verschillend kan zijn van de snelheid die u in Mac OS X bij Systeemvoorkeuren hebt ingesteld.  Om verwarring te voorkomen is de standaardinstelling dat X11 de versnelling niet kan wijzigen.</li>
+    <li><b>Meerknopsmuis emulatie:</b> Dit is hierboven beschreven bij <a HREF="#usage">Gebruik</a>.  Als emulatie is ingeschakeld moet u de gekozen toetsen ingedrukt houden terwijl u met de muis klikt om de tweede en derde muisknop na te bootsen.</li>
+</ul>
+
+<h3>Start</h3>
+<ul>
+    <li><b>Standaard modus:</b> Hier kiest u de standaard scherm-modus: schermvullend of rootless (hierboven beschreven bij <a HREF="#usage">Gebruik</a>).  U kunt ook kiezen tijdens het starten van XDarwin, zie de optie hieronder.</li>
+    <li><b>Kies scherm-modus tijdens start:</b> Dit is standaard ingeschakeld zodat u tijdens het starten van XDarwin kunt kiezen tussen schermvullend en rootless scherm-modus.  Als u dit uitschakelt start XDarwin in de standaard modus zonder u iets te vragen.</li>
+    <li><b>X11 scherm nummer:</b> Met X11 kunnen meerdere schermen worden aangestuurd door verschillende X servers op dezelfde computer.  Als u meerdere X servers tegelijk wilt gebruiken stelt u hier het scherm nummer in dat door XDarwin wordt gebruikt.</li>
+    <li><b>Xinerama multi-monitor ondersteuning mogelijk:</b> XDarwin ondersteunt het gebruik van meerdere monitoren met Xinerama, waarbij elke monitor wordt gezien als deel van &eacute;&eacute;n groot rechthoekig scherm.  U kunt Xinerama hier uitschakelen, maar XDarwin werkt op dit moment zonder Xinerama niet goed met meerdere monitoren.  Als u maar 1 monitor gebruikt is deze instelling automatisch uitgeschakeld.</li>
+    <li><b>Toetsenbordindeling-bestand:</b> Een toetsenbordindeling-bestand wordt bij het starten geladen en omgezet naar een X11 toetsenbordindeling.  Voor verschillende talen vindt u toetsenbordindelingen in de directory <code>/System/Library/Keyboards</code>.</li>
+    <li><b>Bij starten eerste X11 clients:</b> Als XDarwin start, wordt  <code>xinit</code> uitgevoerd om de X window manager en andere X clients te starten (zie "<code>man xinit</code>").  Voordat XDarwin <code>xinit</code> uitvoert voegt het de opgegeven directories toe aan het path.  Standaard wordt alleen <code>/usr/X11R6/bin</code> toegevoegd.  U kunt meerdere directories opgeven, gescheiden door een dubbelepunt.  X clients worden gestart met de standaard login shell van de gebruiker met gebruik van de configuratiebestanden voor die shell.  U kunt een afwijkende shell opgeven.</li>
+</ul>
+
+<h3>Schermvullend</h3>
+<ul>
+    <li><b>Toetscombinatie knop:</b> Klik op deze knop om de toetscombinatie te wijzigen waarmee u tussen de Mac OS X desktop en X11 schakelt.  Als toetscombinatie kunt u elke combinatie gebruiken van de shift, control, command en option toetsen samen met &eacute;&eacute;n normale toets.</li>
+    <li><b>Klikken op icoon in Dock schakelt naar X11:</b> Hiermee is een klik op de XDarwin icoon in de Dock voldoende om naar X11 te schakelen.  In sommige versies van Mac OS X verdwijnt soms de cursor als u deze mogelijkheid gebruikt en daarna terugkeert naar de Mac OS X desktop.</li>
+    <li><b>Toon help bij schermvullend starten:</b> Hiermee wordt een inleidend scherm getoond als XDarwin schermvullend start.</li>
+    <li><b>Kleurdiepte:</b> In de schermvullende modus kan X11 een andere kleurdiepte gebruiken dan Aqua (en de Mac OS X desktop).  Als u "Huidig" kiest, neemt XDarwin bij het starten de kleurdiepte over van Aqua.  U kunt ook kiezen voor 8, 15 of 24 bits.</li>
+</ul>
+
+<h2><a NAME="license">Licentie</a></h2>
+The main license for XDarwin is one based on the traditional MIT X11 / X Consortium License, which does not impose any conditions on modification or redistribution of source code or binaries other than requiring that copyright/license notices are left intact. For more information and additional copyright/licensing notices covering some sections of the code, please refer to the source code.
+<H3><A NAME="3"></A>X Consortium License</H3>
+<p>Copyright (C) 1996 X Consortium</p>
+<p>Permission is hereby granted, free of charge, to any person obtaining a 
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without
+limitation the rights to use, copy, modify, merge, publish, distribute,
+sublicense, and/or sell copies of the Software, and to permit persons to
+whom the Software is furnished to do so, subject to the following conditions:</p>
+<p>The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Software.</p>
+<p>THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT
+SHALL THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+IN THE SOFTWARE.</p>
+<p>Except as contained in this notice, the name of the X Consortium shall
+not be used in advertising or otherwise to promote the sale, use or
+other dealings in this Software without prior written authorization from
+the X Consortium.</p>
+<p>X Window System is a trademark of X Consortium, Inc.</p>
+</body>
+</html>
+
diff --git a/hw/darwin/bundle/English.lproj/Credits.rtf b/hw/darwin/bundle/English.lproj/Credits.rtf
index 2bf7a8eaf..34408e78c 100644
--- a/hw/darwin/bundle/English.lproj/Credits.rtf
+++ b/hw/darwin/bundle/English.lproj/Credits.rtf
@@ -5,10 +5,20 @@
 \vieww5160\viewh6300\viewkind0
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
 
-\f0\fs24 \cf0 This product  includes software developed by The XFree86 Project, Inc  (http://www.xfree86.org/) and its contributors. The following people contributed to Darwin/Mac OS X support.\
+\f0\fs24 \cf0 This product includes software developed by The XFree86 Project, Inc  (http://www.xfree86.org/) and its contributors. The following people contributed to Darwin/Mac OS X support.\
 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
 
+\f1\b \cf0 Contributors to Xorg Foundation Release:
+\f0\b0 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
+\cf0 Kaleb KEITHLEY\
+     
+\f2\i Working left and right Ctrl, Alt (Option), Meta (Command) and Shift keys.
+\f0\i0 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
+
+\f1\b \cf0 \
 \f1\b \cf0 Contributors to XFree86 4.4:
 \f0\b0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
diff --git a/hw/darwin/bundle/English.lproj/InfoPlist.strings.cpp b/hw/darwin/bundle/English.lproj/InfoPlist.strings.cpp
index 99211244e..aeb210342 100644
--- a/hw/darwin/bundle/English.lproj/InfoPlist.strings.cpp
+++ b/hw/darwin/bundle/English.lproj/InfoPlist.strings.cpp
@@ -1,5 +1,5 @@
 /* English versions of the Info.plist keys; used by most localizations. */
 /* Most of these are set in the target application settings. */
-/* $XFree86: xc/programs/Xserver/hw/darwin/bundle/English.lproj/InfoPlist.strings.cpp,v 1.4 2003/01/15 02:34:04 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/darwin/bundle/English.lproj/InfoPlist.strings.cpp,v 1.3 2002/07/17 01:24:55 torrey Exp $ */
 
-NSHumanReadableCopyright = __quote__XFree86 XF86_VERSION\nCopyright 2003 XFree86 Project, Inc.__quote__;
+NSHumanReadableCopyright = __quote__ X_VENDOR_NAME X_VERSION __quote__;
diff --git a/hw/darwin/bundle/English.lproj/Localizable.strings b/hw/darwin/bundle/English.lproj/Localizable.strings
index 241d1585b..2c25c1dc3 100644
--- a/hw/darwin/bundle/English.lproj/Localizable.strings
+++ b/hw/darwin/bundle/English.lproj/Localizable.strings
@@ -1,5 +1,5 @@
 /* English localized versions of strings used by the Mac OS X front end. */
-/* $XFree86: xc/programs/Xserver/hw/darwin/bundle/English.lproj/Localizable.strings,v 1.4 2003/11/04 22:48:14 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/darwin/bundle/English.lproj/Localizable.strings,v 1.3 2002/01/30 06:50:46 torrey Exp $ */
 
 /* Title of alert panel */
 "Quit X server?" = "Quit X server?";
diff --git a/hw/darwin/bundle/English.lproj/MainMenu.nib/objects.nib b/hw/darwin/bundle/English.lproj/MainMenu.nib/objects.nib
index c480ad63f..ebbfd8317 100644
--- a/hw/darwin/bundle/English.lproj/MainMenu.nib/objects.nib
+++ b/hw/darwin/bundle/English.lproj/MainMenu.nib/objects.nib
diff --git a/hw/darwin/bundle/English.lproj/XDarwinHelp.html.cpp b/hw/darwin/bundle/English.lproj/XDarwinHelp.html.cpp
index fc11e26d3..5996285ae 100644
--- a/hw/darwin/bundle/English.lproj/XDarwinHelp.html.cpp
+++ b/hw/darwin/bundle/English.lproj/XDarwinHelp.html.cpp
@@ -1,19 +1,14 @@
-<!-- $XFree86: xc/programs/Xserver/hw/darwin/bundle/English.lproj/XDarwinHelp.html.cpp,v 1.2 2001/11/04 07:02:28 torrey Exp $ -->
-
-#include "xf86Version.h"
-#ifndef PRE_RELEASE
-#define PRE_RELEASE XF86_VERSION_SNAP
-#endif
+<!-- $XFree86: xc/programs/Xserver/hw/darwin/bundle/English.lproj/XDarwinHelp.html.cpp,v 1.1 2001/05/21 01:42:17 torrey Exp $ -->
 
 <html>
 <head>
-<title>XFree86 for Mac OS X</title>
+<title>XDarwin Help</title>
 </head>
 <body>
 <center>
-    <h1>XFree86 on Darwin and Mac OS X</h1>
-    XFree86 XF86_VERSION<br>
-    Release Date: XF86_REL_DATE
+    <h1>XDarwin X Server for Mac OS X</h1>
+    X_VENDOR_NAME X_VERSION<br>
+    Release Date: X_REL_DATE
 </center>
 <h2>Contents</h2>
 <ol>
@@ -27,8 +22,8 @@
     <h2><a NAME="notice">Important Notice</a></h2>
 </center>
 <blockquote>
-#if PRE_RELEASE
-This is a pre-release version of XFree86, and is not supported in any way. Bugs may be reported and patches may be submitted to the <A HREF="http://sourceforge.net/projects/xonx/">XonX project page</A> at SourceForge.  Before reporting bugs in pre-release versions, please check the latest version from <A HREF="http://sourceforge.net/projects/xonx/">XonX</A> or in the <A HREF="http://www.XFree86.Org/cvs">XFree86 CVS repository</A>.
+#if X_PRE_RELEASE
+This is a pre-release version of XDarwin, and is not supported in any way. Bugs may be reported and patches may be submitted to the <A HREF="http://sourceforge.net/projects/xonx/">XonX project page</A> at SourceForge.  Before reporting bugs in pre-release versions, please check the latest version from <A HREF="http://sourceforge.net/projects/xonx/">XonX</A> or the X_VENDOR_LINK.
 #else
 If the server is older than 6-12 months, or if your hardware is newer than the above date, look for a newer version before reporting problems. Bugs may be reported and patches may be submitted to the <A HREF="http://sourceforge.net/projects/xonx/">XonX project page</A> at SourceForge.
 #endif
@@ -37,8 +32,7 @@ If the server is older than 6-12 months, or if your hardware is newer than the a
 This software is distributed under the terms of the <A HREF="#license">MIT X11 / X Consortium License</A> and is provided AS IS, with no warranty. Please read the <A HREF="#license">License</A> before using.</blockquote>
 
 <h2><a NAME="usage">Usage</a></h2>
-<p>XFree86 is a freely redistributable open-source implementation of the <a HREF
-="http://www.x.org/">X Window System</a> produced by the <a HREF="http://www.XFree86.Org/">XFree86 Project, Inc.</a> The X window server for Darwin and Mac OS X provided by XFree86 is called XDarwin. XDarwin runs on Mac OS X in full screen or rootless modes.</p>
+<p>XDarwin is a freely redistributable open-source X server for the <a HREF="http://www.x.org/">X Window System</a>. This version of XDarwin was produced by the X_VENDOR_LINK. XDarwin runs on Mac OS X in full screen or rootless modes.</p>
 <p>In full screen mode, when the X window system is active, it takes over the entire screen. You can switch back to the Mac OS X desktop by holding down Command-Option-A. This key combination can be changed in the user preferences. From the Mac OS X desktop, click on the XDarwin icon in the Dock to switch back to the X window system.  (You can change this behavior in the user preferences so that you must click the XDarwin icon in the floating switch window instead.)</p>
 <p>In rootless mode, the X window system and Aqua share your display. The root window of the X11 display is the size of the screen and contains all the other windows. The X11 root window is not displayed in rootless mode as Aqua handles the desktop background.</p>
 <h3>Multi-Button Mouse Emulation</h3>
@@ -47,7 +41,7 @@ This software is distributed under the terms of the <A HREF="#license">MIT X11 /
 <h2><a NAME="path">Setting Your Path</a></h2>
 <p>Your path is the list of directories to be searched for executable commands. The X11 commands are located in <code>/usr/X11R6/bin</code>, which needs to be added to your path. XDarwin does this for you by default and can also add additional directories where you have installed command line applications.</p>
 <p>More experienced users will have already set their path correctly using the initialization files for their shell. In this case, you can inform XDarwin not to modify your path in the preferences. XDarwin launches the initial X11 clients in the user's default login shell. (An alternate shell can also be specified in the preferences.) The way to set the path depends on the shell you are using. This is described in the man page documentation for the shell.</p>
-<p>In addition you may also want to add the man pages from XFree86 to the list of pages to be searched when you are looking for documentation. The X11 man pages are located in <code>/usr/X11R6/man</code> and the <code>MANPATH</code> environment variable contains the list of directories to search.</p>
+<p>In addition you may also want to add the X11 man pages to the list of pages to be searched when you are looking for documentation. The X11 man pages are located in <code>/usr/X11R6/man</code> and the <code>MANPATH</code> environment variable contains the list of directories to search.</p>
 
 <h2><a NAME="prefs">User Preferences</a></h2>
 <p>A number of options may be set from the user preferences, accessible from the "Preferences..." menu item in the "XDarwin" menu. The options listed as start up options will not take effect until you have restarted XDarwin. All other options take effect immediately. The various options are described below:</p>
@@ -75,8 +69,7 @@ This software is distributed under the terms of the <A HREF="#license">MIT X11 /
 </ul>
 
 <h2><a NAME="license">License</a></h2>
-The XFree86 Project is committed to providing freely redistributable binary and source releases. The main license we use is one based on the traditional MIT X11 / X Consortium License, which does not impose any conditions on modification or redistribution of source code or binaries other than requiring that copyright/license notices are left intact. For more information and additional copyright/licensing notices covering some sections of the code, please see the <A HREF="http://www.xfree86.org/legal/licence.html">XFree86
-License page</A>.
+The main license for XDarwin is based on the traditional MIT X11 / X Consortium License, which does not impose any conditions on modification or redistribution of source code or binaries other than requiring that copyright/license notices are left intact. For more information and additional copyright/licensing notices covering some sections of the code, please refer to the source code.
 <H3><A NAME="3"></A>X Consortium License</H3>
 <p>Copyright (C) 1996 X Consortium</p>
 <p>Permission is hereby granted, free of charge, to any person obtaining a 
diff --git a/hw/darwin/bundle/French.lproj/Credits.rtf b/hw/darwin/bundle/French.lproj/Credits.rtf
index 82f12ac44..17e0a0d70 100644
--- a/hw/darwin/bundle/French.lproj/Credits.rtf
+++ b/hw/darwin/bundle/French.lproj/Credits.rtf
@@ -5,10 +5,20 @@
 \vieww5160\viewh4480\viewkind0
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
 
-\f0\fs24 \cf0 This product  includes software developed by The XFree86 Project, Inc  (http://www.xfree86.org/) and its contributors. The following people contributed to Darwin/Mac OS X support.\
+\f0\fs24 \cf0 This product includes software developed by The XFree86 Project, Inc  (http://www.xfree86.org/) and its contributors. The following people contributed to Darwin/Mac OS X support.\
 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
 
+\f1\b \cf0 Contributors to Xorg Foundation Release:
+\f0\b0 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
+\cf0 Kaleb KEITHLEY\
+     
+\f2\i Working left and right Ctrl, Alt (Option), Meta (Command) and Shift keys.
+\f0\i0 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
+
+\f1\b \cf0 \
 \f1\b \cf0 Contributors to XFree86 4.4:
 \f0\b0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
diff --git a/hw/darwin/bundle/French.lproj/MainMenu.nib/objects.nib b/hw/darwin/bundle/French.lproj/MainMenu.nib/objects.nib
index cc6620bcb..109d5cc6f 100644
--- a/hw/darwin/bundle/French.lproj/MainMenu.nib/objects.nib
+++ b/hw/darwin/bundle/French.lproj/MainMenu.nib/objects.nib
diff --git a/hw/darwin/bundle/French.lproj/XDarwinHelp.html.cpp b/hw/darwin/bundle/French.lproj/XDarwinHelp.html.cpp
index 0fdfb01fb..2a14793db 100644
--- a/hw/darwin/bundle/French.lproj/XDarwinHelp.html.cpp
+++ b/hw/darwin/bundle/French.lproj/XDarwinHelp.html.cpp
@@ -1,19 +1,14 @@
-<!-- $XFree86: xc/programs/Xserver/hw/darwin/bundle/French.lproj/XDarwinHelp.html.cpp,v 1.2 2001/12/20 06:42:20 torrey Exp $ -->
-
-#include "xf86Version.h"
-#ifndef PRE_RELEASE
-#define PRE_RELEASE XF86_VERSION_SNAP
-#endif
+<!-- $XFree86: xc/programs/Xserver/hw/darwin/bundle/English.lproj/XDarwinHelp.html.cpp,v 1.2 2001/11/04 07:02:28 torrey Exp $ -->
 
 <html>
 <head><META HTTP-EQUIV="content-type" CONTENT="text/html; charset=iso-8859-1">
-<title>XFree86 pour Mac OS X</title>
+<title>XDarwin Help</title>
 </head>
 <body>
 <center>
-    <h1>XFree86 pour Darwin et Mac OS X</h1>
-    XFree86 XF86_VERSION<br>
-    Date : XF86_REL_DATE
+    <h1>XDarwin X Server pour Mac OS X</h1>
+    X_VENDOR_NAME X_VERSION<br>
+    Date : X_REL_DATE
 </center>
 <h2>Sommaire</h2>
 <ol>
@@ -28,8 +23,8 @@
 </center>
 <blockquote>
 #if PRE_RELEASE
-Ceci est une pr�-version de XFree86 et ne fait par cons�quent l'objet d'aucun support client. Les bogues peuvent �tre signal�s et des patches peuvent �tre soumis sur la 
-<A HREF="http://sourceforge.net/projects/xonx/">page du projet XonX</A> chez SourceForge. Veuillez prendre connaissance de la derni�re version sur <A HREF="http://sourceforge.net/projects/xonx/">XonX</A> ou sur le <A HREF="http://www.XFree86.Org/cvs">r�pertoire CVS de XFree86</A> avant de signaler un bogue d'une pr�-version.
+Ceci est une pr�-version de XDarwin et ne fait par cons�quent l'objet d'aucun support client. Les bogues peuvent �tre signal�s et des patches peuvent �tre soumis sur la 
+<A HREF="http://sourceforge.net/projects/xonx/">page du projet XonX</A> chez SourceForge. Veuillez prendre connaissance de la derni�re version sur <A HREF="http://sourceforge.net/projects/xonx/">XonX</A> ou le X_VENDOR_LINK avant de signaler un bogue d'une pr�-version.
 #else
 Si le serveur date de plus de 6-12 mois ou si votre mat�riel est plus r�cent que la date indiqu�e ci-dessus, veuillez vous procurer une version plus r�cente avant de signaler toute anomalie. Les bogues peuvent �tre signal�s et des patches peuvent �tre soumis sur la <A HREF="http://sourceforge.net/projects/xonx/">page du projet XonX</A> chez SourceForge.
 #endif
@@ -39,8 +34,8 @@ Ce logiciel est distribu� sous la
 <A HREF="#license">Licence du Consortium X/X11 du MIT</A> et est fourni TEL QUEL, sans garanties. Veuillez prendre connaissance de la <A HREF="#license">Licence</A> avant toute utilisation.</blockquote>
 
 <h2><a NAME="usage">Utilisation</a></h2>
-<p>XFree86 est une impl�mentation libre et distribuable sans contrainte du <a HREF
-="http://www.x.org/">X Window System</a> produit par <a HREF="http://www.XFree86.Org/">XFree86 Project, Inc.</a> Le serveur X window pour Darwin et Mac OS X fourni par XFree86 se nomme XDarwin. XDarwin fonctionne sous Mac OS X en mode � rootless � ou plein �cran.</p>
+<p>XDarwin est une X server libre et distribuable sans contrainte du <a HREF
+="http://www.x.org/">X Window System</a>. This version of XDarwin was produced by the X_VENDOR_LINK. XDarwin fonctionne sous Mac OS X en mode � rootless � ou plein �cran.</p>
 <p>Lorsque le syst�me X window est actif en mode plein �cran, il prend en charge la totalit� de l'�cran. Il est possible de revenir sur le bureau de Mac OS X en appuyant sur Commande-Option-A. Cette combinaison de touches peut �tre modifi�e dans les pr�f�rences. Pour revenir dans X window, cliquer sur l'ic�ne de XDarwin dans le Dock de Mac OS X.  (Un r�glage des pr�f�rences permet d'effectuer cette op�ration en cliquant dans une fen�tre flottante au lieu de l'ic�ne du Dock)</p>
 <p>En mode � rootless �, X window system et Aqua utilisent le m�me affichage. La fen�tre-m�re de l'affichage X11 est de la taille de l'�cran et contient toutes les autre fen�tres. En mode � rootless � cette fen�tre-m�re n'est pas affich�e car Aqua g�re le fond d'�cran.</p>
 <h3>�mulation de souris � plusieurs boutons</h3>
@@ -49,7 +44,7 @@ Ce logiciel est distribu� sous la
 <h2><a NAME="path">R�glage du chemin d'acc�s</a></h2>
 <p>Le chemin d'acc�s est une liste de r�pertoires utilis�s pour la recherche d'ex�cutables. Les commandes X11 sont situ�es dans <code>/usr/X11R6/bin</code>, qui doit �tre ajout� � votre chemin d'acc�s. XDarwin fait cela par d�faut, et peut �galement ajouter d'autres r�pertoires dans lesquels vous auriez install� d'autre commandes unix.</p>
 <p>Les utilisateurs plus exp�riment�s auront d�j� r�gl� leur chemin d'acc�s correctement par le biais des fichiers d'initialisation de leur shell. Dans ce cas, il est possible de demander � XDarwin de ne pas modifier le chemin d'acc�s initial. XDarwin lance les premiers clients X11 dans le shell d'ouverture de session par d�faut. (Un shell de remplacement peut �tre sp�cifi� dans les pr�f�rences.) La fa�on de r�gler le chemin d'acc�s d�pend du shell utilis�. Ceci est document� dans les pages "man" du shell.</p>
-<p>De plus, il est possible d'ajouter les pages "man" de XFree86 � la liste des pages recherch�es pour la documentation "man". Les pages "man" X11 se trouvent dans <code>/usr/X11R6/man</code>  et la variable d'environnement <code>MANPATH</code> contient la liste des r�pertoires dans lesquels chercher.</p>
+<p>De plus, il est possible d'ajouter les pages "man" de X11 � la liste des pages recherch�es pour la documentation "man". Les pages "man" X11 se trouvent dans <code>/usr/X11R6/man</code>  et la variable d'environnement <code>MANPATH</code> contient la liste des r�pertoires dans lesquels chercher.</p>
 
 
 <h2><a NAME="prefs">Pr�f�rences</a></h2>
@@ -78,8 +73,7 @@ Ce logiciel est distribu� sous la
 </ul>
 
 <h2><a NAME="license">Licence</a></h2>
-The XFree86 Project is committed to providing freely redistributable binary and source releases. The main license we use is one based on the traditional MIT X11 / X Consortium License, which does not impose any conditions on modification or redistribution of source code or binaries other than requiring that copyright/license notices are left intact. For more information and additional copyright/licensing notices covering some sections of the code, please see the <A HREF="http://www.xfree86.org/legal/licence.html">XFree86
-License page</A>.
+The main license for XDarwin is one based on the traditional MIT X11 / X Consortium License, which does not impose any conditions on modification or redistribution of source code or binaries other than requiring that copyright/license notices are left intact. For more information and additional copyright/licensing notices covering some sections of the code, please refer to the source code.
 <H3><A NAME="3"></A>X Consortium License</H3>
 <p>Copyright (C) 1996 X Consortium</p>
 <p>Permission is hereby granted, free of charge, to any person obtaining a 
diff --git a/hw/darwin/bundle/German.lproj/Credits.rtf b/hw/darwin/bundle/German.lproj/Credits.rtf
index 2bf7a8eaf..34408e78c 100644
--- a/hw/darwin/bundle/German.lproj/Credits.rtf
+++ b/hw/darwin/bundle/German.lproj/Credits.rtf
@@ -5,10 +5,20 @@
 \vieww5160\viewh6300\viewkind0
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
 
-\f0\fs24 \cf0 This product  includes software developed by The XFree86 Project, Inc  (http://www.xfree86.org/) and its contributors. The following people contributed to Darwin/Mac OS X support.\
+\f0\fs24 \cf0 This product includes software developed by The XFree86 Project, Inc  (http://www.xfree86.org/) and its contributors. The following people contributed to Darwin/Mac OS X support.\
 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
 
+\f1\b \cf0 Contributors to Xorg Foundation Release:
+\f0\b0 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
+\cf0 Kaleb KEITHLEY\
+     
+\f2\i Working left and right Ctrl, Alt (Option), Meta (Command) and Shift keys.
+\f0\i0 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
+
+\f1\b \cf0 \
 \f1\b \cf0 Contributors to XFree86 4.4:
 \f0\b0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
diff --git a/hw/darwin/bundle/German.lproj/MainMenu.nib/objects.nib b/hw/darwin/bundle/German.lproj/MainMenu.nib/objects.nib
index 7855fa3df..28fff8920 100644
--- a/hw/darwin/bundle/German.lproj/MainMenu.nib/objects.nib
+++ b/hw/darwin/bundle/German.lproj/MainMenu.nib/objects.nib
diff --git a/hw/darwin/bundle/German.lproj/XDarwinHelp.html.cpp b/hw/darwin/bundle/German.lproj/XDarwinHelp.html.cpp
index 6b1b91f5c..5996285ae 100644
--- a/hw/darwin/bundle/German.lproj/XDarwinHelp.html.cpp
+++ b/hw/darwin/bundle/German.lproj/XDarwinHelp.html.cpp
@@ -1,19 +1,14 @@
-<!-- $XFree86: xc/programs/Xserver/hw/darwin/bundle/German.lproj/XDarwinHelp.html.cpp,v 1.1 2001/11/03 00:25:34 torrey Exp $ -->
-
-#include "xf86Version.h"
-#ifndef PRE_RELEASE
-#define PRE_RELEASE XF86_VERSION_SNAP
-#endif
+<!-- $XFree86: xc/programs/Xserver/hw/darwin/bundle/English.lproj/XDarwinHelp.html.cpp,v 1.1 2001/05/21 01:42:17 torrey Exp $ -->
 
 <html>
 <head>
-<title>XFree86 for Mac OS X</title>
+<title>XDarwin Help</title>
 </head>
 <body>
 <center>
-    <h1>XFree86 on Darwin and Mac OS X</h1>
-    XFree86 XF86_VERSION<br>
-    Release Date: XF86_REL_DATE
+    <h1>XDarwin X Server for Mac OS X</h1>
+    X_VENDOR_NAME X_VERSION<br>
+    Release Date: X_REL_DATE
 </center>
 <h2>Contents</h2>
 <ol>
@@ -27,43 +22,54 @@
     <h2><a NAME="notice">Important Notice</a></h2>
 </center>
 <blockquote>
-#if PRE_RELEASE
-This is a pre-release version of XFree86, and is not supported in any way. Bugs may be reported and patches may be submitted to the <A HREF="http://sourceforge.net/projects/xonx/">XonX project page</A> at SourceForge.  Before reporting bugs in pre-release versions, please check the latest version from <A HREF="http://sourceforge.net/projects/xonx/">XonX</A> or in the <A HREF="http://www.XFree86.Org/cvs">XFree86 CVS repository</A>.
+#if X_PRE_RELEASE
+This is a pre-release version of XDarwin, and is not supported in any way. Bugs may be reported and patches may be submitted to the <A HREF="http://sourceforge.net/projects/xonx/">XonX project page</A> at SourceForge.  Before reporting bugs in pre-release versions, please check the latest version from <A HREF="http://sourceforge.net/projects/xonx/">XonX</A> or the X_VENDOR_LINK.
 #else
 If the server is older than 6-12 months, or if your hardware is newer than the above date, look for a newer version before reporting problems. Bugs may be reported and patches may be submitted to the <A HREF="http://sourceforge.net/projects/xonx/">XonX project page</A> at SourceForge.
 #endif
 </blockquote>
 <blockquote>
 This software is distributed under the terms of the <A HREF="#license">MIT X11 / X Consortium License</A> and is provided AS IS, with no warranty. Please read the <A HREF="#license">License</A> before using.</blockquote>
+
 <h2><a NAME="usage">Usage</a></h2>
-<p>XFree86 is a freely redistributable open-source implementation of the <a HREF
-="http://www.x.org/">X Window System</a> produced by the <a HREF="http://www.XFree86.Org/">XFree86 Project, Inc.</a> XFree86 runs on Mac OS X in full screen mode. When the X window system is active, it takes over the entire screen. You can switch back to the Mac OS X desktop by holding down Command-Option-A. This key combination can be changed in the user preferences. From the Mac OS X desktop, just click on the XDarwin icon in the floating switch window to switch back to the X window system. You can change this behavior in the user preferences so that clicking on the XDarwin icon in the Dock switches as well.</p>
+<p>XDarwin is a freely redistributable open-source X server for the <a HREF="http://www.x.org/">X Window System</a>. This version of XDarwin was produced by the X_VENDOR_LINK. XDarwin runs on Mac OS X in full screen or rootless modes.</p>
+<p>In full screen mode, when the X window system is active, it takes over the entire screen. You can switch back to the Mac OS X desktop by holding down Command-Option-A. This key combination can be changed in the user preferences. From the Mac OS X desktop, click on the XDarwin icon in the Dock to switch back to the X window system.  (You can change this behavior in the user preferences so that you must click the XDarwin icon in the floating switch window instead.)</p>
+<p>In rootless mode, the X window system and Aqua share your display. The root window of the X11 display is the size of the screen and contains all the other windows. The X11 root window is not displayed in rootless mode as Aqua handles the desktop background.</p>
 <h3>Multi-Button Mouse Emulation</h3>
-<p>Many X11 applications rely on the use of a 3-button mouse. To emulate a 3-button mouse with a single button, select "Enable emulation of multiple mouse buttons" in the Preferences. When emulating a 3-button mouse, holding down the left command key and clicking the mouse button will simulate clicking the second mouse button. Holding down the left option key and clicking will simulate the third button.</p>
-<p>Notes:</p>
-<ul>
-    <li>With most keyboards the left and right command and option keys are not differentiated so either will work.
-    <li>Even with command and/or option keys mapped to some other key with xmodmap, you still must use the original command and option keys for multibutton mouse emulation.
-    <li>The only way to simulate holding down the left command key and clicking the second mouse button is to map some other key to be the left command key. The same is true for simulating holding down the left option key and clicking the third mouse button.
-</ul>
+<p>Many X11 applications rely on the use of a 3-button mouse. You can emulate a 3-button mouse with a single button by holding down various modifier keys while you click the mouse button. This is controlled by settings in the "Multi-Button Mouse Emulation" section of the "General" preferences. By default, emulation is on and holding down the command key and clicking the mouse button will simulate clicking the second mouse button. Holding down the option key and clicking will simulate the third button. You can change to any combination of modifiers to emulate buttons two and three in the preferences. Note, even if the modifiers keys are mapped to some other key with xmodmap, you still must use the actual keys specified in the preferences for multi-button mouse emulation.</p>
+
 <h2><a NAME="path">Setting Your Path</a></h2>
-<p>The X11 binaries are located in /usr/X11R6/bin, which you may need to add to your path. Your path is the list of directories to be searched for executable commands. The way to do this depends on the shell you are using. The following directions are for tcsh, which is the default shell on Darwin and Mac OS X.</p>
-<p>You can check your path by typing "printenv PATH". You should see /usr/X11R6/bin listed as one of the directories. If not, you should add it to your default path. To do so, you can add the following line to the file ~/Library/init/tcsh/path: (You may need to create this file and directory path if it does not exist already.)</p>
-<blockquote>setenv PATH "${PATH}:/usr/X11R6/bin"</blockquote>
-<p>Note that if you have created a .cshrc or .tcshrc file, these files will override your settings in ~/Library/init/tcsh/ and you will need to change one of these files instead. These changes will not take effect until you open a new Terminal window. You may also want to add the man pages from XFree86 to the list of pages to be searched when you are looking for documentation. The X11 man pages are located in /usr/X11R6/man and the MANPATH environment variable contains the list of directories to search.</p>
+<p>Your path is the list of directories to be searched for executable commands. The X11 commands are located in <code>/usr/X11R6/bin</code>, which needs to be added to your path. XDarwin does this for you by default and can also add additional directories where you have installed command line applications.</p>
+<p>More experienced users will have already set their path correctly using the initialization files for their shell. In this case, you can inform XDarwin not to modify your path in the preferences. XDarwin launches the initial X11 clients in the user's default login shell. (An alternate shell can also be specified in the preferences.) The way to set the path depends on the shell you are using. This is described in the man page documentation for the shell.</p>
+<p>In addition you may also want to add the X11 man pages to the list of pages to be searched when you are looking for documentation. The X11 man pages are located in <code>/usr/X11R6/man</code> and the <code>MANPATH</code> environment variable contains the list of directories to search.</p>
+
 <h2><a NAME="prefs">User Preferences</a></h2>
-<p>A number of options may be set from the user preferences, accessible from the "Preferences..." menu item in the "XDarwin" menu. The options listed under Startup Options will not take effect until you have restarted XDarwin. All other options take effect immediately. The various options are described below:</p>
+<p>A number of options may be set from the user preferences, accessible from the "Preferences..." menu item in the "XDarwin" menu. The options listed as start up options will not take effect until you have restarted XDarwin. All other options take effect immediately. The various options are described below:</p>
+<h3>General</h3>
+<ul>
+    <li><b>Use System beep for X11:</b> When enabled the standard Mac OS X alert sound is used as the X11 bell. When disabled (default) a simple tone is used.</li>
+    <li><b>Allow X11 to change mouse acceleration:</b> In a standard X window system implementation, the window manager can change the mouse acceleration. This can lead to confusion as the mouse acceleration may be set to different values by the Mac OS X System Preferences and the X window manager. By default, X11 is not allowed to change the mouse acceleration to avoid this problem.</li>
+    <li><b>Multi-Button Mouse Emulation:</b> This is described above under <a HREF="#usage">Usage</a>. When emulation is enabled the selected modifiers must be held down when the mouse button is pushed to emulate the second or third mouse buttons.</li>
+</ul>
+<h3>Start Up</h3>
 <ul>
-    <li>Key combination button: Click this button and then press any number of modifiers followed by a standard key to change the key combination to switch between Aqua and X11.</li>
-    <li>Use System beep for X11: When enabled the standard Mac OS X alert sound is used as X11 bell. When disabled (default) a simple tone is used.</li>
-    <li>Click on icon in Dock switches to X11: Enable this to activate switching to X11 by clicking on the XDarwin icon in the Dock. On some versions of Mac OS X, switching by clicking in the Dock can cause the cursor to disappear on returning to Aqua.</li>
-    <li>Show help on startup: This will show the introductory splash screen when XDarwin is launched.</li>
-    <li>Display number: This sets what X display number XDarwin should assign to the display. Note that XDarwin always takes over the main display when showing X11.</li>
-    <li>Keymapping: By default, XDarwin loads the keymapping from the Darwin kernel on startup. On portables, this keymapping is sometimes empty so that the keyboard will appear to be dead in X11. If "Load from file" is selected, XDarwin will load the keymapping from the specified file instead.</li>
+    <li><b>Default Mode:</b> If the user does not indicate whether to run in full screen or rootless mode, the mode specified here will be used.</li>
+    <li><b>Show mode pick panel on startup:</b> By default, a panel is displayed when XDarwin is started to allow the user to choose between full screen or rootless mode. If this option is turned off, the default mode will be started automatically.</li>
+    <li><b>X11 Display number:</b> X11 allows there to be multiple displays managed by separate X servers on a single computer. The user may specify an integer display number for XDarwin to use if more than one X server is going to be run simultaneously.</li>
+    <li><b>Allow Xinerama multiple monitor support:</b> XDarwin supports multiple monitors with Xinerama, which treats all monitors as being part of one large rectangular screen. You can disable Xinerama with this option, but currently XDarwin does not handle multiple monitors correctly without it. If you only have a single monitor, Xinerama is automatically disabled.</li>
+    <li><b>Keymapping File:</b> A keymapping file is read at startup and translated to an X11 keymap. Keymapping files, available for a wide variety of languages, are found in <code>/System/Library/Keyboards</code>.</li>
+    <li><b>Starting First X11 Clients:</b> When XDarwin is started from the Finder, it will run <code>xinit</code> to launch the X window manager and other X clients. (See "<code>man xinit</code>" for more information.) Before XDarwin runs <code>xinit</code> it will add the specified directories to the user's path. By default only <code>/usr/X11R6/bin</code> is added. Additional directories may added, separated by a colon. The X clients are started in the user's default login shell so that the user's shell initialization files are read. If desired, an alternate shell may be specified.</li>
 </ul>
+<h3>Full Screen</h3>
+<ul>
+    <li><b>Key combination button:</b> Click this button and then press any number of modifiers followed by a standard key to change the key combination to switch between Aqua and X11.</li>
+    <li><b>Click on icon in Dock switches to X11:</b> Enable this to activate switching to X11 by clicking on the XDarwin icon in the Dock. On some versions of Mac OS X, switching by clicking in the Dock can cause the cursor to disappear on returning to Aqua.</li>
+    <li><b>Show help on startup:</b> This will show an introductory splash screen when XDarwin is started in full screen mode.</li>
+    <li><b>Color bit depth:</b> In full screen mode, the X11 display can use a different color bit depth than is used by Aqua. If "Current" is specified, the depth used by Aqua when XDarwin starts will be used. Otherwise 8, 15, or 24 bits may be specified.</li>
+</ul>
+
 <h2><a NAME="license">License</a></h2>
-The XFree86 Project is committed to providing freely redistributable binary and source releases. The main license we use is one based on the traditional MIT X11 / X Consortium License, which doesn't impose any conditions on modification or redistribution of source code or binaries other than requiring that copyright/license notices are left intact. For more information and additional copyright/licensing notices covering some sections of the code, please see the <A HREF="http://www.xfree86.org/legal/licence.html">XFree86
-License page</A>.
+The main license for XDarwin is based on the traditional MIT X11 / X Consortium License, which does not impose any conditions on modification or redistribution of source code or binaries other than requiring that copyright/license notices are left intact. For more information and additional copyright/licensing notices covering some sections of the code, please refer to the source code.
 <H3><A NAME="3"></A>X Consortium License</H3>
 <p>Copyright (C) 1996 X Consortium</p>
 <p>Permission is hereby granted, free of charge, to any person obtaining a 
diff --git a/hw/darwin/bundle/Japanese.lproj/Credits.rtf b/hw/darwin/bundle/Japanese.lproj/Credits.rtf
index 8278a4063..cf9eae207 100644
--- a/hw/darwin/bundle/Japanese.lproj/Credits.rtf
+++ b/hw/darwin/bundle/Japanese.lproj/Credits.rtf
@@ -1,175 +1,193 @@
-{\rtf1\mac\ansicpg10000\cocoartf102
-{\fonttbl\f0\fswiss\fcharset77 Helvetica;\f1\fswiss\fcharset77 Helvetica-Bold;\f2\fswiss\fcharset77 Helvetica-Oblique;
-\f3\fnil\fcharset78 HiraKakuPro-W3;}
+{\rtf1\mac\ansicpg10001\cocoartf102
+{\fonttbl\f0\fnil\fcharset78 HiraKakuPro-W3;\f1\fswiss\fcharset77 Helvetica;\f2\fswiss\fcharset77 Helvetica-Bold;
+\f3\fswiss\fcharset77 Helvetica-Oblique;}
 {\colortbl;\red255\green255\blue255;}
 \vieww13980\viewh11160\viewkind0
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
 
-\f0\fs24 \cf0 This product  includes software developed by The XFree86 Project, Inc  (http://www.xfree86.org/) and its contributors. The following people contributed to Darwin/Mac OS X support.\
+\f0\fs24 \cf0 \'82\'b1\'82\'cc\'90\'bb\'95\'69\'82\'cd 
+\f1 XFree86 
+\f0 \'83\'76\'83\'8d\'83\'57\'83\'46\'83\'4e\'83\'67
+\f1 (http://www.xfree86.org/)
+\f0 \'82\'a8\'82\'e6\'82\'d1\'82\'bb\'82\'cc\'8d\'76\'8c\'a3\'8e\'d2\'82\'c9\'82\'e6\'82\'c1\'82\'c4\'8a\'4a\'94\'ad\'82\'b3\'82\'ea\'82\'bd\'83\'5c\'83\'74\'83\'67\'83\'45\'83\'46\'83\'41\'82\'f0\'8a\'dc\'82\'f1\'82\'c5\'82\'a2\'82\'dc\'82\'b7\'81\'42\'8e\'9f\'82\'cc\'90\'6c\'81\'58\'82\'cd Darwin
+\f1 /Mac OS X 
+\f0 \'82\'cc\'83\'54\'83\'7c\'81\'5b\'83\'67\'82\'c9\'8d\'76\'8c\'a3\'82\'b5\'82\'dc\'82\'b5\'82\'bd\'81\'42
+\f1 \
 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
 
-\f1\b \cf0 Contributors to XFree86 4.4:
-\f0\b0 \
+\f2\b \cf0 Contributors to Xorg Foundation Release:
+\f1\b0 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
+\cf0 Kaleb KEITHLEY\
+     
+\f0 \'8d\'b6\'89\'45\'82\'cc Ctrl,Alt(Option),Meta(Command) \'82\'a8\'82\'e6\'82\'d1 Shift \'83\'4c\'81\'5b\'82\'cc\'93\'ae\'8d\'ec
+\f1 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
+
+\f2\b \cf0 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
+\cf0 Contributors to XFree86 4.4:
+\f1\b0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
 \cf0 John Harper
-\f2\i \
+\f3\i \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
 
-\f3\i0 \cf0    \'83\'8b\'81\'5b\'83\'67\'83\'8c\'83\'58 \'83\'41\'83\'4e\'83\'5a\'83\'89\'83\'8c\'81\'5b\'83\'56\'83\'87\'83\'93 \'82\'a8\'82\'e6\'82\'d1 Apple-WM \'8a\'67\'92\'a3
-\f0 \
+\f0\i0 \cf0    \'83\'8b\'81\'5b\'83\'67\'83\'8c\'83\'58 \'83\'41\'83\'4e\'83\'5a\'83\'89\'83\'8c\'81\'5b\'83\'56\'83\'87\'83\'93 \'82\'a8\'82\'e6\'82\'d1 Apple-WM \'8a\'67\'92\'a3
+\f1 \
 Torrey T. Lyons\
      
-\f3 \'83\'76\'83\'8d\'83\'57\'83\'46\'83\'4e\'83\'67 \'83\'8a\'81\'5b\'83\'5f\'81\'5b\
+\f0 \'83\'76\'83\'8d\'83\'57\'83\'46\'83\'4e\'83\'67 \'83\'8a\'81\'5b\'83\'5f\'81\'5b\
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
 
-\f1\b \cf0 \
+\f2\b \cf0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
 \cf0 Additional XonX Contributors to XFree86 4.3:
-\f0\b0 \
+\f1\b0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
 \cf0 Fabr\'92cio Luis de Castro\
      
-\f3 \'83\'7c\'83\'8b\'83\'67\'83\'4b\'83\'8b\'8c\'ea\'83\'8d\'81\'5b\'83\'4a\'83\'89\'83\'43\'83\'59
-\f0 \
+\f0 \'83\'7c\'83\'8b\'83\'67\'83\'4b\'83\'8b\'8c\'ea\'83\'8d\'81\'5b\'83\'4a\'83\'89\'83\'43\'83\'59
+\f1 \
 Michael Oland\
      
-\f3 \'90\'56\'82\'b5\'82\'a2
-\f0 XDarwin 
-\f3 \'83\'41\'83\'43\'83\'52\'83\'93
-\f0 \
+\f0 \'90\'56\'82\'b5\'82\'a2 
+\f1 XDarwin 
+\f0 \'83\'41\'83\'43\'83\'52\'83\'93
+\f1 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
 
-\f1\b \cf0 \
+\f2\b \cf0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
 \cf0 XonX Contributors to XFree86 4.2:
-\f0\b0 \
+\f1\b0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
 \cf0 Rob Braun\
      Darwin x86
-\f2\i  
-\f3\i0 \'83\'54\'83\'7c\'81\'5b\'83\'67
-\f0 \
+\f3\i  
+\f0\i0 \'83\'54\'83\'7c\'81\'5b\'83\'67
+\f1 \
 Pablo Di Noto\
 
-\f2\i      
-\f3\i0 \'83\'58\'83\'79\'83\'43\'83\'93\'8c\'ea\'83\'8d\'81\'5b\'83\'4a\'83\'89\'83\'43\'83\'59
-\f0 \
+\f3\i      
+\f0\i0 \'83\'58\'83\'79\'83\'43\'83\'93\'8c\'ea\'83\'8d\'81\'5b\'83\'4a\'83\'89\'83\'43\'83\'59
+\f1 \
 Paul Edens\
 
-\f2\i      
-\f3\i0 \'83\'49\'83\'89\'83\'93\'83\'5f\'8c\'ea\'83\'8d\'81\'5b\'83\'4a\'83\'89\'83\'43\'83\'59
-\f0 \
+\f3\i      
+\f0\i0 \'83\'49\'83\'89\'83\'93\'83\'5f\'8c\'ea\'83\'8d\'81\'5b\'83\'4a\'83\'89\'83\'43\'83\'59
+\f1 \
 Kyunghwan Kim\
 
-\f2\i      
-\f3\i0 \'8a\'d8\'8d\'91\'8c\'ea\'83\'8d\'81\'5b\'83\'4a\'83\'89\'83\'43\'83\'59
-\f0 \
+\f3\i      
+\f0\i0 \'8a\'d8\'8d\'91\'8c\'ea\'83\'8d\'81\'5b\'83\'4a\'83\'89\'83\'43\'83\'59
+\f1 \
 Mario Klebsch\
      
-\f3 \'94\'f1US\'83\'4c\'81\'5b\'83\'7b\'81\'5b\'83\'68 \'83\'54\'83\'7c\'81\'5b\'83\'67
-\f0 \
+\f0 \'94\'f1US\'83\'4c\'81\'5b\'83\'7b\'81\'5b\'83\'68 \'83\'54\'83\'7c\'81\'5b\'83\'67
+\f1 \
 Torrey T. Lyons\
      
-\f3 \'83\'76\'83\'8d\'83\'57\'83\'46\'83\'4e\'83\'67 \'83\'8a\'81\'5b\'83\'5f\'81\'5b
-\f0 \
+\f0 \'83\'76\'83\'8d\'83\'57\'83\'46\'83\'4e\'83\'67 \'83\'8a\'81\'5b\'83\'5f\'81\'5b
+\f1 \
 Andreas Monitzer\
      
-\f3 \'83\'68\'83\'43\'83\'63\'8c\'ea\'83\'8d\'81\'5b\'83\'4a\'83\'89\'83\'43\'83\'59
-\f0 \
+\f0 \'83\'68\'83\'43\'83\'63\'8c\'ea\'83\'8d\'81\'5b\'83\'4a\'83\'89\'83\'43\'83\'59
+\f1 \
 Patrik Montgomery\
 
-\f2\i      
-\f3\i0 \'83\'58\'83\'45\'83\'46\'81\'5b\'83\'66\'83\'93\'8c\'ea\'83\'8d\'81\'5b\'83\'4a\'83\'89\'83\'43\'83\'59
-\f0 \
+\f3\i      
+\f0\i0 \'83\'58\'83\'45\'83\'46\'81\'5b\'83\'66\'83\'93\'8c\'ea\'83\'8d\'81\'5b\'83\'4a\'83\'89\'83\'43\'83\'59
+\f1 \
 Greg Parker\
      
-\f3 \'83\'8b\'81\'5b\'83\'67\'83\'8c\'83\'58 \'83\'54\'83\'7c\'81\'5b\'83\'67
-\f0 \
+\f0 \'83\'8b\'81\'5b\'83\'67\'83\'8c\'83\'58 \'83\'54\'83\'7c\'81\'5b\'83\'67
+\f1 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
 
-\f3 \cf0 \'93\'63\'92\'86 \'8f\'72\'8c\'f5
-\f0 \
+\f0 \cf0 \'93\'63\'92\'86 \'8f\'72\'8c\'f5
+\f1 \
      
-\f3 \'93\'fa\'96\'7b\'8c\'ea\'83\'8d\'81\'5b\'83\'4a\'83\'89\'83\'43\'83\'59
-\f0 \
+\f0 \'93\'fa\'96\'7b\'8c\'ea\'83\'8d\'81\'5b\'83\'4a\'83\'89\'83\'43\'83\'59
+\f1 \
 Olivier Verdier\
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
 
-\f2\i \cf0      
-\f3\i0 \'83\'74\'83\'89\'83\'93\'83\'58\'8c\'ea\'83\'8d\'81\'5b\'83\'4a\'83\'89\'83\'43\'83\'59
-\f0 \
+\f3\i \cf0      
+\f0\i0 \'83\'74\'83\'89\'83\'93\'83\'58\'8c\'ea\'83\'8d\'81\'5b\'83\'4a\'83\'89\'83\'43\'83\'59
+\f1 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
 
-\f1\b \cf0 \
+\f2\b \cf0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
 \cf0 Special Thanks:
-\f0\b0 \
+\f1\b0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
 \cf0 Devin Poolman and Zero G Software, Inc.\
 
-\f2\i      
-\f3\i0 \'83\'43\'83\'93\'83\'58\'83\'67\'81\'5b\'83\'89
-\f0 \
+\f3\i      
+\f0\i0 \'83\'43\'83\'93\'83\'58\'83\'67\'81\'5b\'83\'89
+\f1 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
 
-\f1\b \cf0 \
+\f2\b \cf0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
 \cf0 XonX Team Members\
 Contributing to XFree86 4.1:
-\f0\b0 \
+\f1\b0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
 \cf0 Rob Braun\
      Darwin x86 
-\f3 \'83\'54\'83\'7c\'81\'5b\'83\'67
-\f0 \
+\f0 \'83\'54\'83\'7c\'81\'5b\'83\'67
+\f1 \
 Torrey T. Lyons\
      
-\f3 \'83\'76\'83\'8d\'83\'57\'83\'46\'83\'4e\'83\'67 \'83\'8a\'81\'5b\'83\'5f\'81\'5b
-\f0 \
+\f0 \'83\'76\'83\'8d\'83\'57\'83\'46\'83\'4e\'83\'67 \'83\'8a\'81\'5b\'83\'5f\'81\'5b
+\f1 \
 Andreas Monitzer\
      Cocoa 
-\f3 \'94\'c5 XDarwin \'83\'74\'83\'8d\'83\'93\'83\'67\'83\'47\'83\'93\'83\'68
-\f0 \
+\f0 \'94\'c5 XDarwin \'83\'74\'83\'8d\'83\'93\'83\'67\'83\'47\'83\'93\'83\'68
+\f1 \
 Greg Parker\
      
-\f3 \'8d\'c5\'8f\'89\'82\'cc Quartz \'83\'43\'83\'93\'83\'76\'83\'8a\'83\'81\'83\'93\'83\'67
-\f0 \
+\f0 \'8d\'c5\'8f\'89\'82\'cc Quartz \'83\'43\'83\'93\'83\'76\'83\'8a\'83\'81\'83\'93\'83\'67
+\f1 \
 Christoph Pfisterer\
      
-\f3 \'8b\'a4\'97\'4c\'83\'89\'83\'43\'83\'75\'83\'89\'83\'8a
-\f0 \
+\f0 \'8b\'a4\'97\'4c\'83\'89\'83\'43\'83\'75\'83\'89\'83\'8a
+\f1 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
 
-\f3 \cf0 \'93\'63\'92\'86 \'8f\'72\'8c\'f5
-\f0 \
+\f0 \cf0 \'93\'63\'92\'86 \'8f\'72\'8c\'f5
+\f1 \
      
-\f3 \'93\'fa\'96\'7b\'8c\'ea\'83\'8d\'81\'5b\'83\'4a\'83\'89\'83\'43\'83\'59
-\f0 \
+\f0 \'93\'fa\'96\'7b\'8c\'ea\'83\'8d\'81\'5b\'83\'4a\'83\'89\'83\'43\'83\'59
+\f1 \
 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
 
-\f1\b \cf0 Special Thanks:
-\f0\b0 \
+\f2\b \cf0 Special Thanks:
+\f1\b0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
 \cf0 Tiago Ribeiro\
      XDarwin 
-\f3 \'83\'41\'83\'43\'83\'52\'83\'93
-\f0 \
+\f0 \'83\'41\'83\'43\'83\'52\'83\'93
+\f1 \
 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
 
-\f1\b \cf0 History:
-\f0\b0 \
+\f2\b \cf0 History:
+\f1\b0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
 \cf0 John Carmack\
      
-\f3 XFree86 \'82\'cc Mac OS X Server \'82\'d6\'82\'cc\'8d\'c5\'8f\'89\'82\'cc\'88\'da\'90\'41
-\f0 \
+\f0 XFree86 \'82\'cc Mac OS X Server \'82\'d6\'82\'cc\'8d\'c5\'8f\'89\'82\'cc\'88\'da\'90\'41
+\f1 \
 Dave Zarzycki\
      XFree86 4.0 
-\f3 \'82\'f0 Darwin 1.0 \'82\'c9\'88\'da\'90\'41
-\f0 \
+\f0 \'82\'f0 Darwin 1.0 \'82\'c9\'88\'da\'90\'41
+\f1 \
 Torrey T. Lyons\
      XFree86 4.0.2 
-\f3 \'83\'76\'83\'8d\'83\'57\'83\'46\'83\'4e\'83\'67\'82\'d6\'82\'cc\'93\'9d\'8d\'87}
-\ No newline at end of file
+\f0 \'83\'76\'83\'8d\'83\'57\'83\'46\'83\'4e\'83\'67\'82\'d6\'82\'cc\'93\'9d\'8d\'87}
+\ No newline at end of file
diff --git a/hw/darwin/bundle/Japanese.lproj/MainMenu.nib/objects.nib b/hw/darwin/bundle/Japanese.lproj/MainMenu.nib/objects.nib
index 7903eb622..357002706 100644
--- a/hw/darwin/bundle/Japanese.lproj/MainMenu.nib/objects.nib
+++ b/hw/darwin/bundle/Japanese.lproj/MainMenu.nib/objects.nib
diff --git a/hw/darwin/bundle/Japanese.lproj/XDarwinHelp.html.cpp b/hw/darwin/bundle/Japanese.lproj/XDarwinHelp.html.cpp
index 2065d43d4..6653f5bea 100644
--- a/hw/darwin/bundle/Japanese.lproj/XDarwinHelp.html.cpp
+++ b/hw/darwin/bundle/Japanese.lproj/XDarwinHelp.html.cpp
@@ -1,149 +1,141 @@
-<!-- $XFree86: xc/programs/Xserver/hw/darwin/bundle/Japanese.lproj/XDarwinHelp.html.cpp,v 1.5 2002/05/04 01:25:40 torrey Exp $ -->
-
-#include "xf86Version.h"
-#ifndef PRE_RELEASE
-#define PRE_RELEASE XF86_VERSION_SNAP
-#endif
-
-<html>
-<head>
-<META http-equiv="Content-Type" content="text/html; charset=EUC-JP">
-<title>
-XFree86 for Mac OS X</title></head>
-<body>
-<center>
-    <h1>XFree86 on Darwin and Mac OS X</h1>
-    XFree86 XF86_VERSION<br>
-    Release Date: XF86_REL_DATE
-</center>
-<h2>�ܼ�</h2>
-<ol>
-    <li><A HREF="#notice">���ջ���</A></li>
-    <li><A HREF="#usage">����ˡ</A></li>
-    <li><A HREF="#path">�ѥ�������</A></li>
-    <li><A HREF="#prefs">�Ķ�����</A></li>
-    <li><A HREF="#license">�饤����</A></li>
-</ol>
-<center>
-        <h2><a NAME="notice">���ջ���</a></h2>
-</center>
-<blockquote>
-#if PRE_RELEASE
-����ϡ�XFree86 �Υץ��꡼���С������Ǥ��ꡤ�����ʤ���ˤ����Ƥ⥵�ݡ��Ȥ���ޤ��� 
-�Х�������ѥå��� SourceForge �� <A HREF="http://sourceforge.net/projects/xonx/">XonX �ץ��������ȥڡ���</A>����Ф���Ƥ��뤫�⤷��ޤ���
-�ץ��꡼���С������ΥХ�����𤹤����ˡ�<A HREF="http://sourceforge.net/projects/xonx/">XonX</A> �ץ��������ȥڡ����ޤ��� <A HREF="http://www.XFree86.Org/cvs">XFree86 CVS ��ݥ��ȥ�</A>�Ǻǿ��ǤΥ����å��򤷤Ʋ�������
-#else
-�⤷�������С��� 6 -12 ����ʾ����Τ�Τ����ޤ��Ϥ��ʤ��Υϡ��ɥ��������嵭�����դ��⿷������Τʤ�С��������𤹤����ˤ�꿷�����С�������õ���ƤߤƤ���������
-�Х�������ѥå��� SourceForge �� <A HREF="http://sourceforge.net/projects/xonx/">XonX �ץ��������ȥڡ���</A>����Ф���Ƥ��뤫�⤷��ޤ���
-#endif
-</blockquote>
-<blockquote>
-�ܥ��եȥ������ϡ�<A HREF="#license">MIT X11/X Consortium License</A> �ξ��˴�Ť���̵�ݾڤǡ��֤��Τޤޡפη��Ƕ��뤵��ޤ���
-�����Ѥˤʤ����ˡ�<A HREF="#license">�饤���󥹾��</A>���ɤ߲�������
-</blockquote>
-
-<h2><a NAME="usage">����ˡ</a></h2>
-<p>XFree86 �ϡ�<a HREF="http://www.XFree86.Org/">XFree86 Project, Inc.</a>�ˤ�äƺ������줿�������۲�ǽ�ʥ����ץ󥽡����� <a HREF="http://www.x.org/">X Window System</a> �μ����Ǥ���
-XFree86 �ˤ�ä��󶡤���� Darwin �� Mac OS X �Τ���� X Window �����С��� XDarwin �ȸƤӤޤ���
-XDarwin �ϡ�Mac OS X ��ǥե륹���꡼��⡼�ɤޤ��ϥ롼�ȥ쥹�⡼�ɤ�ư��ޤ���</p>
-
-<p>�ե륹���꡼��⡼�ɤǤϡ�X Window System �������ƥ��֤ʻ�������������̤���ͭ���ޤ���
-���ʤ��ϡ�Command-Option-A �����򲡤����Ȥˤ�ä� Mac OS X �ǥ����ȥåפ��ڤ��ؤ��뤳�Ȥ��Ǥ��ޤ������Υ������Ȥ߹�碌�ϡ��Ķ�������ѹ���ǽ�Ǥ���
-Mac OS X �ǥ����ȥåפ��� X Window System ���ڤ��ؤ�����ϡ��ɥå���ɽ�����줿 XDarwin ��������򥯥�å����Ʋ�������
-�ʴĶ�����ǡ��ե����ƥ��󥰡�������ɥ���ɽ�����줿 XDarwin ��������򥯥�å�����褦���ѹ����뤳�Ȥ��Ǥ��ޤ�����</p>
-
-<p>�롼�ȥ쥹�⡼�ɤǤϡ�X Window System �� Aqua �ϲ��̤�ͭ���ޤ���
-X11 ��ɽ������롼�ȥ�����ɥ��ϲ��̤Υ������Ǥ��ꡤ¾�����ƤΥ�����ɥ���ޤ�Ǥ��ޤ���
-Aqua ���ǥ����ȥåפ��طʤ����椹��Τǡ�X11 �Υ롼�ȥ�����ɥ��ϥ롼�ȥ쥹�⡼�ɤǤ�ɽ������ޤ���</p>
-
-<h3>ʣ���ܥ���ޥ����Υ��ߥ�졼�����</h3>
-<p>¿���� X11 ���ץꥱ�������ϡ�3 �ܥ���ޥ�����ɬ�פȤ��ޤ���
-���ʤ��ϥޥ����ܥ���Υ���å���Ʊ���ˤ����Ĥ��ν��������򲡤����Ȥˤ�äơ���ĤΥܥ���� 3 �ܥ���ޥ����򥨥ߥ�졼����󤹤뤳�Ȥ��Ǥ��ޤ���
-����ϡ��Ķ�����Ρְ�������פΡ�ʣ���ܥ���ޥ����Υ��ߥ�졼�����ץ������������ꤷ�ޤ���
-�ǥե���ȤǤϡ����ߥ�졼������ͭ���ǡ����ޥ�ɥ����򲡤��ʤ���ޥ����ܥ���򥯥�å����뤳�Ȥ��� 2 �ޥ����ܥ���Υ���å����������ޤ���
-���ץ���󥭡��򲡤��ʤ��饯��å����뤳�Ȥ��� 3 �ޥ����ܥ���Υ���å����������ޤ���
-���ʤ��ϡ��Ķ�����ǥܥ��� 2 �� 3 �򥨥ߥ�졼�Ȥ��뤿��˻��Ѥ��뽤���������ȹ礻���ѹ����뤳�Ȥ��Ǥ��ޤ���
-�������������� xmodmap ��¾�Υ����˳�����ƤƤ�����Ǥ⡤ʣ���ܥ���ޥ����Υ��ߥ�졼�����Ǥ�����Υ��ޥ�ɥ����䥪�ץ���󥭡���Ȥ�ʤ���Фʤ�ޤ���</p>
-
-<h2><a NAME="path">�ѥ�������</a></h2>
-<p>�ѥ��ϡ� �¹Բ�ǽ�ʥ��ޥ�ɤ򸡺�����ǥ��쥯�ȥ�Υꥹ�ȤǤ���
-X11 �Х��ʥ�ϡ�<code>/usr/X11R6/bin</code> ���֤���ޤ������ʤ��Ϥ����ѥ��˲ä���ɬ�פ�����ޤ���
-XDarwin �ϡ������ǥե���ȤǹԤ��ޤ����ޤ������ʤ������ޥ�ɥ饤�󡦥��ץꥱ�������򥤥󥹥ȡ��뤷���ɲäΥǥ��쥯�ȥ��ä��뤳�Ȥ��Ǥ��ޤ���</p>
-
-<p>�и�˭���ʥ桼�����ϡ����Ǥ˼���Υ�����Τ���˽�����ե��������Ѥ��ƥѥ������ꤷ�Ƥ���Ǥ��礦��
-���ξ�硤���ʤ��ϴĶ������ XDarwin �����ʤ��Υѥ����ѹ����ʤ��褦�����ꤹ�뤳�Ȥ��Ǥ��ޤ���
-XDarwin �ϡ��桼�����Υǥե���ȤΥ������󥷥���Ǻǽ�� X11 ���饤����Ȥ򳫻Ϥ��ޤ���
-�ʴĶ����������Υ��������ꤹ�뤳�Ȥ��Ǥ��ޤ�����
-�ѥ������ꤹ����ˡ�ϡ����ʤ������Ѥ��Ƥ��륷����˰�¸���ޤ���
-����ϡ�������Υޥ˥奢��ڡ����ɥ�����Ȥ˵��ܤ���Ƥ��ޤ���
-
-<p>�ޤ������ʤ��ϥɥ�����Ȥ�õ���Ƥ������XFree86 �Υޥ˥奢��ڡ����򸡺������ڡ����Υꥹ�Ȥ��ɲä������Ȼפ����⤷��ޤ���
-X11 �Υޥ˥奢��ڡ����� <code>/usr/X11R6/man</code> ���֤���ޤ��������� <code>MANPATH</code> �Ķ��ѿ��ϸ�������ǥ��쥯�ȥ�Υꥹ�Ȥ�ޤ�Ǥ��ޤ���</p>
-
-<h2><a NAME="prefs">�Ķ�����</a></h2>
-<p>��XDarwin�ץ�˥塼�ΡִĶ�����...�ץ�˥塼���ܤ��饢�������Ǥ���Ķ�����ѥͥ�ǡ������Ĥ��Υ��ץ��������ꤹ�뤳�Ȥ��Ǥ��ޤ���
-�ֵ�ư���ץ����פ����Ƥϡ�XDarwin ��Ƶ�ư����ޤ�ͭ���Ȥʤ�ޤ���
-¾�����ƤΥ��ץ��������Ƥϡ�ľ����ͭ���Ȥʤ�ޤ���
-�ʲ������줾��Υ��ץ����ˤĤ����������ޤ�:</p>
-
-<h3>��������</h3>
-<ul>
-    <li><b>X11 �ǥ����ƥ�Υӡ��ײ�����Ѥ���:</b> ����ξ�硤Mac OS X �Υӡ��ײ��� X11 �Υ٥�Ȥ��ƻ��Ѥ���ޤ������դξ��ʥǥե���ȡˡ�����ץ� �ȡ��󤬻Ȥ��ޤ���</li>
-    <li><b>X11 �Υޥ�����������졼������ͭ���ˤ���:</b> ɸ��Ū�� X Window System �μ����Ǥϡ�������ɥ��ޥ͡����㡼�ϥޥ����β�®�٤��ѹ����뤳�Ȥ��Ǥ��ޤ���
-    �ޥ����β�®�٤� Mac OS X �Υ����ƥ�Ķ������ X ������ɥ��ޥ͡����㡼���ۤʤ��ͤ����ꤷ����硤����Ϻ���򾷤��ޤ���
-    ����������򤱤뤿�ᡤ�ǥե���ȤǤ� X11 �Υޥ�����������졼������ͭ���Ȥ��ޤ���</li>
-    <li><b>ʣ���ܥ���ޥ����Υ��ߥ�졼�����:</b> <a HREF="#usage">����ˡ</a>�򻲾Ȥ��Ʋ�����������ξ�硤�ޥ����ܥ����� 2 �ޤ����� 3 �Υޥ����ܥ���򥨥ߥ�졼�Ȥ�����ˡ����򤷤�����������Ʊ���˲����ޤ���</li>
-</ul>
-
-<h3>��ư���ץ����</h3>
-<ul>
-    <li><b>���̥⡼��:</b> �桼�������ե륹���꡼��⡼�ɤޤ��ϥ롼�ȥ쥹�⡼�ɤΤɤ������Ѥ��뤫����ꤷ�ʤ���硤�����ǻ��ꤵ�줿�⡼�ɤ��Ȥ��ޤ���</li>
-    <li><b>��ư���˥⡼������ѥͥ��ɽ������:</b> �ǥե���ȤǤϡ�XDarwin �ε�ư���˥桼�������ե륹���꡼��⡼�ɤޤ��ϥ롼�ȥ쥹�⡼�ɤΤɤ������Ѥ��뤫�����򤹤�ѥͥ��ɽ�����ޤ������Υ��ץ���󤬥��դξ�硤���̥⡼�ɤǻ��ꤷ���⡼�ɤǵ�ư���ޤ���</li>
-    <li><b>X11 �ǥ����ץ쥤�ֹ�:</b> X11�ϡ���ĤΥ���ԥ塼������̡��� X �����С�����������ʣ���Υǥ����ץ쥤��¸�ߤ��뤳�Ȥ�����ޤ���ʣ���� X �����С���Ʊ���˼¹Ԥ��Ƥ������XDarwin �����Ѥ���ǥ����ץ쥤���ֹ����ꤹ�뤳�Ȥ��Ǥ��ޤ���</li>
-    <li><b>Xinerama �ޥ����˥����ݡ��Ȥ�ͭ���ˤ���:</b> XDarwin �ϡ�Xinerama �ޥ����˥��򥵥ݡ��Ȥ��ޤ�����������ƤΥ�˥����Ĥ��礭�ʲ��̤ΰ����Ȥߤʤ��ޤ������ʤ��Ϥ��Υ��ץ����� Xinerama ��̵���ˤ��뤳�Ȥ��Ǥ��ޤ��������������� XDarwin �Ϥ���̵����������ʣ���Υ�˥��򰷤����Ȥ��Ǥ��ޤ��󡣤⤷�����ʤ�����ĤΥ�˥���Ȥ������ʤ�С�Xinerama �ϼ�ưŪ��̵���Ȥʤ�ޤ���</li>
-    <li><b>�����ޥåԥ󥰥ե�����:</b> �����ޥåԥ󥰥ե�����ϵ�ư�����ɤ߹��ޤ졤X11 �����ޥåפ��Ѵ�����ޤ���¾������б����������ޥåԥ󥰥ե������ <code>/System/Library/Keyboards</code> �ˤ���ޤ����������������ޥåԥ󥰤� Japanese �����򤹤�ȡ������Υ����������ʤ������Զ�礬ȯ�����뤳�Ȥ�����ޤ������ξ��� USA �����򤷤���� ~/.Xmodmap ��Ŭ�Ѥ��Ʋ���������</li>
-    <li><b>�ǽ�� X11 ���饤����Ȥε�ư:</b> XDarwin �� Finder���鵯ư�������X ������ɥ��ޥ͡����㡼�� X ���饤����Ȥε�ư�� <code>xinit</code> ��¹Ԥ��ޤ����ʾܺ٤� "<code>man xinit</code>" �򻲾Ȥ��Ʋ���������XDarwin �� <code>xinit</code> ��¹Ԥ������ˡ����ꤵ�줿�ǥ��쥯�ȥ��桼�����Υѥ����ɲä��ޤ����ǥե���ȤǤ� <code>/usr/X11R6/bin</code> �������ɲä��ޤ���¾�Υǥ��쥯�ȥ���ɲä��������ϡ�������Ƕ��ڤäƻ��ꤷ�ޤ����桼�����Υ����������ե�������ɤ߹��ि��ˡ�X ���饤����Ȥϥ桼�����Υǥե���ȥ������󥷥���ǵ�ư����ޤ���ɬ�פǤ���С�����Υ��������ꤹ�뤳�Ȥ��Ǥ��ޤ���</li>
-</ul>
-
-<h3>�ե륹���꡼��</h3>
-<ul>
-    <li><b>��������ܥ���:</b> X11 �� Aqua ���ڤ��ؤ��뤿��˻��Ѥ���ܥ�����Ȥ߹�碌����ꤷ�ޤ���
-    �ܥ���򥯥�å����ơ�Ǥ�դο��ν���������³�����̾�Υ����򲡤��ޤ���</li>
-    <li><b>�ɥå��Υ�������Υ���å��� X11 �����:</b> ����ξ�硤�ɥå���ɽ�����줿 XDarwin ��������Υ���å��� X11 �ؤ��ڤ괹������ǽ�Ȥʤ�ޤ���Mac OS X �Τ����Ĥ��ΥС������Ǥϡ��ɥå��Υ�������Υ���å��� Aqua ����ä������������뤬�ü����뤳�Ȥ�����ޤ���</li>
-    <li><b>��ư���˥إ�פ�ɽ������:</b> XDarwin ���ե륹���꡼��⡼�ɤǵ�ư����������ץ�å��她���꡼���ɽ�����ޤ���</li>
-    <li><b>������:</b> �ե륹���꡼��⡼�ɤǤϡ�X11 �ǥ����ץ쥤�� Aqua �Ȱۤʤ뿧���٤�Ȥ����Ȥ��Ǥ��ޤ������ѹ��ʤ��פ����ꤵ�줿��硤XDarwin �� Aqua �ˤ�äƻ��Ѥ���뿧���٤�Ȥ��ޤ�������ʳ��� 8��15 �ޤ���24 �ӥåȤ���ꤹ�뤳�Ȥ��Ǥ��ޤ���</li>
-</ul>
-
-<h2>
-<a NAME="license">�饤����</a>
-</h2>
-XFree86 Project �ϡ���ͳ�˺����۲�ǽ�ʥХ��ʥ�ȥ����������ɤ��󶡤��뤳�Ȥ˥��ߥåȤ��Ƥ��ޤ���
-�䤿�������Ѥ����ʥ饤���󥹤ϡ�����Ū�� MIT X11/X Consortium License �˴�Ť���ΤǤ���
-�����ơ�����Ͻ����ޤ��Ϻ����ۤ���륽���������ɤޤ��ϥХ��ʥ�ˡ����� Copyright/�饤���󥹹𼨤����Τޤ޻Ĥ���뤳�Ȥ��׵᤹��ʳ��ξ��������ޤ���
-���¿���ξ���ȡ������ɤΰ����򥫥С������ɲä� Copyright/�饤���󥹹𼨤Τ���ˡ�<A HREF="http://www.xfree86.org/legal/licence.html">XFree86 �� License �ڡ���</A>�򻲾Ȥ��Ʋ�������
-<H3>
-<A NAME="3"></A>
-X  Consortium License</H3>
-<p>Copyright (C) 1996 X Consortium</p>
-<p>Permission is hereby granted, free of charge, to any person obtaining a 
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without
-limitation the rights to use, copy, modify, merge, publish, distribute,
-sublicense, and/or sell copies of the Software, and to permit persons to
-whom the Software is furnished to do so, subject to the following conditions:</p>
-<p>The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.</p>
-<p>THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT
-SHALL THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-IN THE SOFTWARE.</p>
-<p>Except as contained in this notice, the name of the X Consortium shall
-not be used in advertising or otherwise to promote the sale, use or
-other dealings in this Software without prior written authorization from
-the X Consortium.</p>
-<p>X Window System is a trademark of X Consortium, Inc.</p>
-</body>
-</html>
+<!-- $XFree86: xc/programs/Xserver/hw/darwin/bundle/Japanese.lproj/XDarwinHelp.html.cpp,v 1.4 2001/11/27 07:27:46 torrey Exp $ -->
+
+<html>
+<head>
+<META http-equiv="Content-Type" content="text/html; charset=EUC-JP">
+<title>
+XDarwin Help</title></head>
+<body>
+<center>
+    <h1>XDarwin X Server for Mac OS X</h1>
+    X_VENDOR_NAME X_VERSION<br>
+    Release Date: X_REL_DATE
+</center>
+<h2>�ܼ�</h2>
+<ol>
+    <li><A HREF="#notice">���ջ���</A></li>
+    <li><A HREF="#usage">����ˡ</A></li>
+    <li><A HREF="#path">�ѥ�������</A></li>
+    <li><A HREF="#prefs">�Ķ�����</A></li>
+    <li><A HREF="#license">�饤����</A></li>
+</ol>
+<center>
+        <h2><a NAME="notice">���ջ���</a></h2>
+</center>
+<blockquote>
+#if X_PRE_RELEASE
+����ϡ�XDarwin �Υץ��꡼���С������Ǥ��ꡤ�����ʤ���ˤ����Ƥ⥵�ݡ��Ȥ���ޤ��� 
+�Х�������ѥå��� SourceForge �� <A HREF="http://sourceforge.net/projects/xonx/">XonX �ץ��������ȥڡ���</A>����Ф���Ƥ��뤫�⤷��ޤ���
+�ץ��꡼���С������ΥХ�����𤹤����ˡ�<A HREF="http://sourceforge.net/projects/xonx/">XonX</A> �ץ��������ȥڡ����ޤ��� X_VENDOR_LINK�Ǻǿ��ǤΥ����å��򤷤Ʋ�������
+#else
+�⤷�������С��� 6 -12 ����ʾ����Τ�Τ����ޤ��Ϥ��ʤ��Υϡ��ɥ��������嵭�����դ��⿷������Τʤ�С��������𤹤����ˤ�꿷�����С�������õ���ƤߤƤ���������
+�Х�������ѥå��� SourceForge �� <A HREF="http://sourceforge.net/projects/xonx/">XonX �ץ��������ȥڡ���</A>����Ф���Ƥ��뤫�⤷��ޤ���
+#endif
+</blockquote>
+<blockquote>
+�ܥ��եȥ������ϡ�<A HREF="#license">MIT X11/X Consortium License</A> �ξ��˴�Ť���̵�ݾڤǡ��֤��Τޤޡפη��Ƕ��뤵��ޤ���
+�����Ѥˤʤ����ˡ�<A HREF="#license">�饤���󥹾��</A>���ɤ߲�������
+</blockquote>
+
+<h2><a NAME="usage">����ˡ</a></h2>
+<p>XDarwin �ϡ������۲�ǽ�ʥ����ץ󥽡����� <a HREF="http://www.x.org/">X Window System</a> �Τ���� X �����С��μ����Ǥ������ΥС������� XDarwin �� X_VENDOR_LINK �ˤ�äƺ�������ޤ�����XDarwin �ϡ�Mac OS X ��ǥե륹���꡼��⡼�ɤޤ��ϥ롼�ȥ쥹�⡼�ɤ�ư��ޤ���</p>
+
+<p>�ե륹���꡼��⡼�ɤǤϡ�X Window System �������ƥ��֤ʻ�������������̤���ͭ���ޤ���
+���ʤ��ϡ�Command-Option-A �����򲡤����Ȥˤ�ä� Mac OS X �ǥ����ȥåפ��ڤ��ؤ��뤳�Ȥ��Ǥ��ޤ������Υ������Ȥ߹�碌�ϡ��Ķ�������ѹ���ǽ�Ǥ���
+Mac OS X �ǥ����ȥåפ��� X Window System ���ڤ��ؤ�����ϡ��ɥå���ɽ�����줿 XDarwin ��������򥯥�å����Ʋ�������
+�ʴĶ�����ǡ��ե����ƥ��󥰡�������ɥ���ɽ�����줿 XDarwin ��������򥯥�å�����褦���ѹ����뤳�Ȥ��Ǥ��ޤ�����</p>
+
+<p>�롼�ȥ쥹�⡼�ɤǤϡ�X Window System �� Aqua �ϲ��̤�ͭ���ޤ���
+X11 ��ɽ������롼�ȥ�����ɥ��ϲ��̤Υ������Ǥ��ꡤ¾�����ƤΥ�����ɥ���ޤ�Ǥ��ޤ���
+Aqua ���ǥ����ȥåפ��طʤ����椹��Τǡ�X11 �Υ롼�ȥ�����ɥ��ϥ롼�ȥ쥹�⡼�ɤǤ�ɽ������ޤ���</p>
+
+<h3>ʣ���ܥ���ޥ����Υ��ߥ�졼�����</h3>
+<p>¿���� X11 ���ץꥱ�������ϡ�3 �ܥ���ޥ�����ɬ�פȤ��ޤ���
+���ʤ��ϥޥ����ܥ���Υ���å���Ʊ���ˤ����Ĥ��ν��������򲡤����Ȥˤ�äơ���ĤΥܥ���� 3 �ܥ���ޥ����򥨥ߥ�졼����󤹤뤳�Ȥ��Ǥ��ޤ���
+����ϡ��Ķ�����Ρְ�������פΡ�ʣ���ܥ���ޥ����Υ��ߥ�졼�����ץ������������ꤷ�ޤ���
+�ǥե���ȤǤϡ����ߥ�졼������ͭ���ǡ����ޥ�ɥ����򲡤��ʤ���ޥ����ܥ���򥯥�å����뤳�Ȥ��� 2 �ޥ����ܥ���Υ���å����������ޤ���
+���ץ���󥭡��򲡤��ʤ��饯��å����뤳�Ȥ��� 3 �ޥ����ܥ���Υ���å����������ޤ���
+���ʤ��ϡ��Ķ�����ǥܥ��� 2 �� 3 �򥨥ߥ�졼�Ȥ��뤿��˻��Ѥ��뽤���������ȹ礻���ѹ����뤳�Ȥ��Ǥ��ޤ���
+�������������� xmodmap ��¾�Υ����˳�����ƤƤ�����Ǥ⡤ʣ���ܥ���ޥ����Υ��ߥ�졼�����Ǥ�����Υ��ޥ�ɥ����䥪�ץ���󥭡���Ȥ�ʤ���Фʤ�ޤ���</p>
+
+<h2><a NAME="path">�ѥ�������</a></h2>
+<p>�ѥ��ϡ� �¹Բ�ǽ�ʥ��ޥ�ɤ򸡺�����ǥ��쥯�ȥ�Υꥹ�ȤǤ���
+X11 �Х��ʥ�ϡ�<code>/usr/X11R6/bin</code> ���֤���ޤ������ʤ��Ϥ����ѥ��˲ä���ɬ�פ�����ޤ���
+XDarwin �ϡ������ǥե���ȤǹԤ��ޤ����ޤ������ʤ������ޥ�ɥ饤�󡦥��ץꥱ�������򥤥󥹥ȡ��뤷���ɲäΥǥ��쥯�ȥ��ä��뤳�Ȥ��Ǥ��ޤ���</p>
+
+<p>�и�˭���ʥ桼�����ϡ����Ǥ˼���Υ�����Τ���˽�����ե��������Ѥ��ƥѥ������ꤷ�Ƥ���Ǥ��礦��
+���ξ�硤���ʤ��ϴĶ������ XDarwin �����ʤ��Υѥ����ѹ����ʤ��褦�����ꤹ�뤳�Ȥ��Ǥ��ޤ���
+XDarwin �ϡ��桼�����Υǥե���ȤΥ������󥷥���Ǻǽ�� X11 ���饤����Ȥ򳫻Ϥ��ޤ���
+�ʴĶ����������Υ��������ꤹ�뤳�Ȥ��Ǥ��ޤ�����
+�ѥ������ꤹ����ˡ�ϡ����ʤ������Ѥ��Ƥ��륷����˰�¸���ޤ���
+����ϡ�������Υޥ˥奢��ڡ����ɥ�����Ȥ˵��ܤ���Ƥ��ޤ���
+
+<p>�ޤ������ʤ��ϥɥ�����Ȥ�õ���Ƥ������X11 �Υޥ˥奢��ڡ����򸡺������ڡ����Υꥹ�Ȥ��ɲä������Ȼפ����⤷��ޤ���
+X11 �Υޥ˥奢��ڡ����� <code>/usr/X11R6/man</code> ���֤���ޤ��������� <code>MANPATH</code> �Ķ��ѿ��ϸ�������ǥ��쥯�ȥ�Υꥹ�Ȥ�ޤ�Ǥ��ޤ���</p>
+
+<h2><a NAME="prefs">�Ķ�����</a></h2>
+<p>��XDarwin�ץ�˥塼�ΡִĶ�����...�ץ�˥塼���ܤ��饢�������Ǥ���Ķ�����ѥͥ�ǡ������Ĥ��Υ��ץ��������ꤹ�뤳�Ȥ��Ǥ��ޤ���
+�ֵ�ư���ץ����פ����Ƥϡ�XDarwin ��Ƶ�ư����ޤ�ͭ���Ȥʤ�ޤ���
+¾�����ƤΥ��ץ��������Ƥϡ�ľ����ͭ���Ȥʤ�ޤ���
+�ʲ������줾��Υ��ץ����ˤĤ����������ޤ�:</p>
+
+<h3>��������</h3>
+<ul>
+    <li><b>X11 �ǥ����ƥ�Υӡ��ײ�����Ѥ���:</b> ����ξ�硤Mac OS X �Υӡ��ײ��� X11 �Υ٥�Ȥ��ƻ��Ѥ���ޤ������դξ��ʥǥե���ȡˡ�����ץ� �ȡ��󤬻Ȥ��ޤ���</li>
+    <li><b>X11 �Υޥ�����������졼������ͭ���ˤ���:</b> ɸ��Ū�� X Window System �μ����Ǥϡ�������ɥ��ޥ͡����㡼�ϥޥ����β�®�٤��ѹ����뤳�Ȥ��Ǥ��ޤ���
+    �ޥ����β�®�٤� Mac OS X �Υ����ƥ�Ķ������ X ������ɥ��ޥ͡����㡼���ۤʤ��ͤ����ꤷ����硤����Ϻ���򾷤��ޤ���
+    ����������򤱤뤿�ᡤ�ǥե���ȤǤ� X11 �Υޥ�����������졼������ͭ���Ȥ��ޤ���</li>
+    <li><b>ʣ���ܥ���ޥ����Υ��ߥ�졼�����:</b> <a HREF="#usage">����ˡ</a>�򻲾Ȥ��Ʋ�����������ξ�硤�ޥ����ܥ����� 2 �ޤ����� 3 �Υޥ����ܥ���򥨥ߥ�졼�Ȥ�����ˡ����򤷤�����������Ʊ���˲����ޤ���</li>
+</ul>
+
+<h3>��ư���ץ����</h3>
+<ul>
+    <li><b>���̥⡼��:</b> �桼�������ե륹���꡼��⡼�ɤޤ��ϥ롼�ȥ쥹�⡼�ɤΤɤ������Ѥ��뤫����ꤷ�ʤ���硤�����ǻ��ꤵ�줿�⡼�ɤ��Ȥ��ޤ���</li>
+    <li><b>��ư���˥⡼������ѥͥ��ɽ������:</b> �ǥե���ȤǤϡ�XDarwin �ε�ư���˥桼�������ե륹���꡼��⡼�ɤޤ��ϥ롼�ȥ쥹�⡼�ɤΤɤ������Ѥ��뤫�����򤹤�ѥͥ��ɽ�����ޤ������Υ��ץ���󤬥��դξ�硤���̥⡼�ɤǻ��ꤷ���⡼�ɤǵ�ư���ޤ���</li>
+    <li><b>X11 �ǥ����ץ쥤�ֹ�:</b> X11�ϡ���ĤΥ���ԥ塼������̡��� X �����С�����������ʣ���Υǥ����ץ쥤��¸�ߤ��뤳�Ȥ�����ޤ���ʣ���� X �����С���Ʊ���˼¹Ԥ��Ƥ������XDarwin �����Ѥ���ǥ����ץ쥤���ֹ����ꤹ�뤳�Ȥ��Ǥ��ޤ���</li>
+    <li><b>Xinerama �ޥ����˥����ݡ��Ȥ�ͭ���ˤ���:</b> XDarwin �ϡ�Xinerama �ޥ����˥��򥵥ݡ��Ȥ��ޤ�����������ƤΥ�˥����Ĥ��礭�ʲ��̤ΰ����Ȥߤʤ��ޤ������ʤ��Ϥ��Υ��ץ����� Xinerama ��̵���ˤ��뤳�Ȥ��Ǥ��ޤ��������������� XDarwin �Ϥ���̵����������ʣ���Υ�˥��򰷤����Ȥ��Ǥ��ޤ��󡣤⤷�����ʤ�����ĤΥ�˥���Ȥ������ʤ�С�Xinerama �ϼ�ưŪ��̵���Ȥʤ�ޤ���</li>
+    <li><b>�����ޥåԥ󥰥ե�����:</b> �����ޥåԥ󥰥ե�����ϵ�ư�����ɤ߹��ޤ졤X11 �����ޥåפ��Ѵ�����ޤ���¾������б����������ޥåԥ󥰥ե������ <code>/System/Library/Keyboards</code> �ˤ���ޤ����������������ޥåԥ󥰤� Japanese �����򤹤�ȡ������Υ����������ʤ������Զ�礬ȯ�����뤳�Ȥ�����ޤ������ξ��� USA �����򤷤���� ~/.Xmodmap ��Ŭ�Ѥ��Ʋ���������</li>
+    <li><b>�ǽ�� X11 ���饤����Ȥε�ư:</b> XDarwin �� Finder���鵯ư�������X ������ɥ��ޥ͡����㡼�� X ���饤����Ȥε�ư�� <code>xinit</code> ��¹Ԥ��ޤ����ʾܺ٤� "<code>man xinit</code>" �򻲾Ȥ��Ʋ���������XDarwin �� <code>xinit</code> ��¹Ԥ������ˡ����ꤵ�줿�ǥ��쥯�ȥ��桼�����Υѥ����ɲä��ޤ����ǥե���ȤǤ� <code>/usr/X11R6/bin</code> �������ɲä��ޤ���¾�Υǥ��쥯�ȥ���ɲä��������ϡ�������Ƕ��ڤäƻ��ꤷ�ޤ����桼�����Υ����������ե�������ɤ߹��ि��ˡ�X ���饤����Ȥϥ桼�����Υǥե���ȥ������󥷥���ǵ�ư����ޤ���ɬ�פǤ���С�����Υ��������ꤹ�뤳�Ȥ��Ǥ��ޤ���</li>
+</ul>
+
+<h3>�ե륹���꡼��</h3>
+<ul>
+    <li><b>��������ܥ���:</b> X11 �� Aqua ���ڤ��ؤ��뤿��˻��Ѥ���ܥ�����Ȥ߹�碌����ꤷ�ޤ���
+    �ܥ���򥯥�å����ơ�Ǥ�դο��ν���������³�����̾�Υ����򲡤��ޤ���</li>
+    <li><b>�ɥå��Υ�������Υ���å��� X11 �����:</b> ����ξ�硤�ɥå���ɽ�����줿 XDarwin ��������Υ���å��� X11 �ؤ��ڤ괹������ǽ�Ȥʤ�ޤ���Mac OS X �Τ����Ĥ��ΥС������Ǥϡ��ɥå��Υ�������Υ���å��� Aqua ����ä������������뤬�ü����뤳�Ȥ�����ޤ���</li>
+    <li><b>��ư���˥إ�פ�ɽ������:</b> XDarwin ���ե륹���꡼��⡼�ɤǵ�ư����������ץ�å��她���꡼���ɽ�����ޤ���</li>
+    <li><b>������:</b> �ե륹���꡼��⡼�ɤǤϡ�X11 �ǥ����ץ쥤�� Aqua �Ȱۤʤ뿧���٤�Ȥ����Ȥ��Ǥ��ޤ������ѹ��ʤ��פ����ꤵ�줿��硤XDarwin �� Aqua �ˤ�äƻ��Ѥ���뿧���٤�Ȥ��ޤ�������ʳ��� 8��15 �ޤ���24 �ӥåȤ���ꤹ�뤳�Ȥ��Ǥ��ޤ���</li>
+</ul>
+
+<h2>
+<a NAME="license">�饤����</a>
+</h2>
+XDarwin �μ��פʥ饤���󥹤�����Ū�� MIT X11/X Consortium License �˴�Ť��ޤ���
+����Ͻ����ޤ��Ϻ����ۤ���륽���������ɤޤ��ϥХ��ʥ�ˡ��������/�饤����ɽ�������Τޤ޻Ĥ���뤳�Ȥ��׵᤹��ʳ��ξ��������ޤ���
+���¿���ξ���ȡ������ɤΰ����򥫥С������ɲä����/�饤����ɽ���Τ���ˡ������������ɤ򻲾Ȥ��Ʋ�������
+<H3>
+<A NAME="3"></A>
+X  Consortium License</H3>
+<p>Copyright (C) 1996 X Consortium</p>
+<p>Permission is hereby granted, free of charge, to any person obtaining a 
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without
+limitation the rights to use, copy, modify, merge, publish, distribute,
+sublicense, and/or sell copies of the Software, and to permit persons to
+whom the Software is furnished to do so, subject to the following conditions:</p>
+<p>The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Software.</p>
+<p>THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT
+SHALL THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+IN THE SOFTWARE.</p>
+<p>Except as contained in this notice, the name of the X Consortium shall
+not be used in advertising or otherwise to promote the sale, use or
+other dealings in this Software without prior written authorization from
+the X Consortium.</p>
+<p>X Window System is a trademark of X Consortium, Inc.</p>
+</body>
+</html>
diff --git a/hw/darwin/bundle/Portuguese.lproj/Credits.rtf b/hw/darwin/bundle/Portuguese.lproj/Credits.rtf
index 5cbac7433..8dcddc2f7 100644
--- a/hw/darwin/bundle/Portuguese.lproj/Credits.rtf
+++ b/hw/darwin/bundle/Portuguese.lproj/Credits.rtf
@@ -5,10 +5,20 @@
 \vieww5140\viewh4980\viewkind0
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
 
-\f0\fs24 \cf0 This product  includes software developed by The XFree86 Project, Inc  (http://www.xfree86.org/) and its contributors. The following people contributed to Darwin/Mac OS X support.\
+\f0\fs24 \cf0 This product includes software developed by The XFree86 Project, Inc  (http://www.xfree86.org/) and its contributors. The following people contributed to Darwin/Mac OS X support.\
 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
 
+\f1\b \cf0 Contributors to Xorg Foundation Release:
+\f0\b0 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
+\cf0 Kaleb KEITHLEY\
+     
+\f2\i Working left and right Ctrl, Alt (Option), Meta (Command) and Shift keys.
+\f0\i0 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
+
+\f1\b \cf0 \
 \f1\b \cf0 Contributors to XFree86 4.4:
 \f0\b0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
diff --git a/hw/darwin/bundle/Portuguese.lproj/MainMenu.nib/objects.nib b/hw/darwin/bundle/Portuguese.lproj/MainMenu.nib/objects.nib
index 6fc5aa2a3..9cb67cf89 100644
--- a/hw/darwin/bundle/Portuguese.lproj/MainMenu.nib/objects.nib
+++ b/hw/darwin/bundle/Portuguese.lproj/MainMenu.nib/objects.nib
diff --git a/hw/darwin/bundle/Portuguese.lproj/XDarwinHelp.html.cpp b/hw/darwin/bundle/Portuguese.lproj/XDarwinHelp.html.cpp
index 37502eac6..7ef1ba5d8 100644
--- a/hw/darwin/bundle/Portuguese.lproj/XDarwinHelp.html.cpp
+++ b/hw/darwin/bundle/Portuguese.lproj/XDarwinHelp.html.cpp
@@ -1,20 +1,14 @@
-<!-- $XFree86: xc/programs/Xserver/hw/darwin/bundle/Portuguese.lproj/XDarwinHelp.html.cpp,v 1.1 2002/01/25 06:46:46 torrey Exp $ --><html><body>
-
-#include "xf86Version.h"
-#ifndef PRE_RELEASE
-#define PRE_RELEASE XF86_VERSION_SNAP
-#endif
-
+<!-- $XFree86: xc/programs/Xserver/hw/darwin/bundle/English.lproj/XDarwinHelp.html.cpp,v 1.2 2001/11/04 07:02:28 torrey Exp $ --><html><body>
 
 <head>
-<title>XFree86 para Mac OS X</title>
+<title>XDarwin Help</title>
 </head>
 
 <center>
     
-  <h1>XFree86 para Darwin e Mac OS X</h1>
-    XFree86 XF86_VERSION<br>
-    Release Date: XF86_REL_DATE
+  <h1>XDarwin X Server para Mac OS X</h1>
+    X_VENDOR_NAME X_VERSION<br>
+    Release Date: X_REL_DATE
 </center>
 <h2>&Iacute;ndice</h2>
 <ol>
@@ -28,29 +22,32 @@
 <center>
     <h2><a NAME="notice">Notas importantes</a></h2>
 </center>
-<blockquote> #if PRE_RELEASE Essa &eacute; uma vers&atilde;o pr&eacute;-lancamento 
-  do XFree86, e ela n&atilde;o &eacute; suportada de nenhuma forma. Bugs podem 
+<blockquote>
+#if PRE_RELEASE
+  Essa &eacute; uma vers&atilde;o pr&eacute;-lancamento 
+  do XDarwin, e ela n&atilde;o &eacute; suportada de nenhuma forma. Bugs podem 
   ser reportados e corre&ccedil;&otilde;es podem ser enviadas para <A HREF="http://sourceforge.net/projects/xonx/">P&aacute;gina 
   do projeto XonX</A> no SourceForge. Antes de informar bugs em vers&otilde;es 
   pr&eacute;-lancamento, por favor verifique a �ltima vers&atilde;o em <A HREF="http://sourceforge.net/projects/xonx/">XonX</A> 
-  or no <A HREF="http://www.XFree86.Org/cvs">Reposit&oacute;rio CVS do XFree86</A>. 
-  #else Se o servidor &eacute; mais velho que 6-12 semanas, ou seu hardware &eacute; 
+  or X_VENDOR_LINK. 
+#else
+Se o servidor &eacute; mais velho que 6-12 semanas, ou seu hardware &eacute; 
   mais novo que a data acima, procure por uma nova vers&atilde;o antes de informar 
   problemas. Bugs podem ser reportados e corre&ccedil;&otilde;es podem ser enviadas 
   para a <A HREF="http://sourceforge.net/projects/xonx/">P&aacute;gina do projeto 
-  XonX</A> na SourceForge. #endif </blockquote>
+  XonX</A> na SourceForge.
+#endif
+</blockquote>
 <blockquote> Este software &eacute; distribu&iacute;do sob os termos da <a href="#license">licen&ccedil;a 
   MIT X11 / X Consortium</a> e &eacute; provido, sem nenhuma garantia. Por favor 
   leia a <a href="#license">Licen&ccedil;a</a> antes de come&ccedil;ar a usar 
   o programa.</blockquote>
 
 <h2><a NAME="usage">Uso</a></h2>
-<p>O XFree86 &eacute; uma aplica&ccedil;&atilde;o &quot;open-source&quot; livremente 
+<p>O XDarwin &eacute; uma X server &quot;open-source&quot; livremente 
   redistribu&iacute;da do <a HREF
-="http://www.x.org/">Sistema X Window</a> produzido pelo <a HREF="http://www.XFree86.Org/">XFree86 
-  Project, Inc.</a> O servidor X window para o Darwin e Mac OS X provido pelo 
-  XFree86 &eacute; chamado XDarwin. XDarwin roda sobre Mac OS X no modo Tela Cheia 
-  ou no modo Compartilhado.</p>
+="http://www.x.org/">Sistema X Window</a>. This version of XDarwin was produced by the X_VENDOR_LINK.
+  XDarwin roda sobre Mac OS X no modo Tela Cheia ou no modo Compartilhado.</p>
 <p>No modo Tela Cheia, quando o sistema X window est&aacute; ativo, ele ocupa 
   a tela toda. Voc&ecirc; pode voltar ao desktop do Mac OS X clicando Command-Option-A. 
   Essa combina&ccedil;&atilde;o de teclas pode ser mudada nas prefer&ecirc;ncias. 
@@ -90,7 +87,7 @@
   do usu&aacute;rio corrente. (Um shell alternativo pode ser tamb&eacute;m expecificado 
   nas prefer&ecirc;ncias.) O modo para ajustar o path depende do shell que voc&ecirc; 
   est&aacute; usando. Isto &eacute; descrito na man page do seu shell.</p>
-<p>Voc&ecirc; pode tamb&eacute;m querer adicionar as man pages do XFree86 para 
+<p>Voc&ecirc; pode tamb&eacute;m querer adicionar as man pages do X11 para 
   a lista de p&aacute;ginas a serem procuradas quando voc&ecirc; est&aacute; procurando 
   por documenta&ccedil;&atilde;o. As man pages do X11 est&atilde;o localizadas 
   em <code>/usr/X11R6/man</code> e a vari&aacute;vel de ambiente <code>MANPATH</code> 
@@ -178,15 +175,13 @@
 </ul>
 
 <h2><a NAME="license">Licen&ccedil;a</a></h2>
-<p>O projeto XFree86 &eacute; designado a prover e a ser livremente redistribu&iacute;do 
-  as vers&otilde;es bin&aacute;rias e souce (c&oacute;digo-fonte). A licen&ccedil;a 
-  principal n&oacute;s usamos uma baseada na licen&ccedil;a tradicional MIT X11 
+<p>A licen&ccedil;a 
+  principal n&oacute;s por XDarwin baseada na licen&ccedil;a tradicional MIT X11 
   / X Consortium, que n&atilde;o imp&otilde;e nenhuma condi&ccedil;&atilde;o sobre 
   modifica&ccedil;&otilde;es ou redistribui&ccedil;&atilde;o do c&oacute;digo-fonte 
   ou dos bin&aacute;rios desde que o copyright/licen&ccedil;a sejam mantidos intactos. 
   Para mais informa&ccedil;&otilde;es e not&iacute;cias adicionais de copyright/licensing 
-  em algumas se&ccedil;&atilde;o do c&oacute;digo, por favor visite a <a href="http://www.xfree86.org/legal/licence.html">p&aacute;gina 
-  de licen&ccedil;as do XFree86</a>.</p>
+  em algumas se&ccedil;&atilde;o do c&oacute;digo, por favor refer to the source code.</p>
 <H3><A NAME="3"></A>Licen&ccedil;a do X Consortium</H3>
 <p>Copyright (C) 1996 X Consortium</p>
 <p>Permiss&otilde;es s&atilde;o em virtude garantidas, livre de mudan&ccedil;as, 
diff --git a/hw/darwin/bundle/Spanish.lproj/Credits.rtf b/hw/darwin/bundle/Spanish.lproj/Credits.rtf
index 2bf7a8eaf..34408e78c 100644
--- a/hw/darwin/bundle/Spanish.lproj/Credits.rtf
+++ b/hw/darwin/bundle/Spanish.lproj/Credits.rtf
@@ -5,10 +5,20 @@
 \vieww5160\viewh6300\viewkind0
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
 
-\f0\fs24 \cf0 This product  includes software developed by The XFree86 Project, Inc  (http://www.xfree86.org/) and its contributors. The following people contributed to Darwin/Mac OS X support.\
+\f0\fs24 \cf0 This product includes software developed by The XFree86 Project, Inc  (http://www.xfree86.org/) and its contributors. The following people contributed to Darwin/Mac OS X support.\
 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
 
+\f1\b \cf0 Contributors to Xorg Foundation Release:
+\f0\b0 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
+\cf0 Kaleb KEITHLEY\
+     
+\f2\i Working left and right Ctrl, Alt (Option), Meta (Command) and Shift keys.
+\f0\i0 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
+
+\f1\b \cf0 \
 \f1\b \cf0 Contributors to XFree86 4.4:
 \f0\b0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
diff --git a/hw/darwin/bundle/Spanish.lproj/MainMenu.nib/objects.nib b/hw/darwin/bundle/Spanish.lproj/MainMenu.nib/objects.nib
index 0a6953c69..2df75ee0c 100644
--- a/hw/darwin/bundle/Spanish.lproj/MainMenu.nib/objects.nib
+++ b/hw/darwin/bundle/Spanish.lproj/MainMenu.nib/objects.nib
diff --git a/hw/darwin/bundle/Spanish.lproj/XDarwinHelp.html.cpp b/hw/darwin/bundle/Spanish.lproj/XDarwinHelp.html.cpp
index 3e0710a2c..5cd27862d 100644
--- a/hw/darwin/bundle/Spanish.lproj/XDarwinHelp.html.cpp
+++ b/hw/darwin/bundle/Spanish.lproj/XDarwinHelp.html.cpp
@@ -1,19 +1,14 @@
-<!-- $XFree86: xc/programs/Xserver/hw/darwin/bundle/Spanish.lproj/XDarwinHelp.html.cpp,v 1.2 2001/12/30 03:52:27 torrey Exp $ -->
-
-#include "xf86Version.h"
-#ifndef PRE_RELEASE
-#define PRE_RELEASE XF86_VERSION_SNAP
-#endif
+<!-- $XFree86: xc/programs/Xserver/hw/darwin/bundle/English.lproj/XDarwinHelp.html.cpp,v 1.2 2001/11/04 07:02:28 torrey Exp $ -->
 
 <html>
 <head>
-<title>XFree86 para Mac OS X</title>
+<title>XDarwin Ayuda</title>
 </head>
 <body>
 <center>
-    <h1>XFree86 en Darwin y Mac OS X</h1>
-    XFree86 XF86_VERSION<br>
-    Fecha de release: XF86_REL_DATE
+    <h1>XDarwin X Server for Mac OS X</h1>
+    X_VENDOR_NAME X_VERSION<br>
+    Fecha de release: X_REL_DATE
 </center>
 <h2>Contenido</h2>
 <ol>
@@ -28,7 +23,7 @@
 </center>
 <blockquote>
 #if PRE_RELEASE
-Esta es una versi&oacuten pre-release de XFree86, y no tiene ning&uacuten soporte. Patches y reportes de error pueden ser enviados a la <A HREF="http://sourceforge.net/projects/xonx/">p&aacutegina del proyecto XonX</A> en SourceForge.  Antes de reportar errores en versiones pre-release, por favor verifique la ultima versi&oacuten en <A HREF="http://sourceforge.net/projects/xonx/">XonX</A> o bien en el <A HREF="http://www.XFree86.Org/cvs">repositorio CVS de XFree86</A>.
+Esta es una versi&oacuten pre-release de XDarwin, y no tiene ning&uacuten soporte. Patches y reportes de error pueden ser enviados a la <A HREF="http://sourceforge.net/projects/xonx/">p&aacutegina del proyecto XonX</A> en SourceForge.  Antes de reportar errores en versiones pre-release, por favor verifique la ultima versi&oacuten en <A HREF="http://sourceforge.net/projects/xonx/">XonX</A> o bien el X_VENDOR_LINK.
 #else
 Si el server el m&aacutes antiguo que 6 a 12 meses, o si su hardware es posterior a la fecha indicada m&aacutes arriba, por favor verifique la &uacuteltima versi&oacuten antes de reportar problemas. Patches y reportes de error pueden ser enviados a la <A HREF="http://sourceforge.net/projects/xonx/">p&aacutegina del proyecto XonX</A> en SourceForge.
 #endif
@@ -37,8 +32,8 @@ Si el server el m&aacutes antiguo que 6 a 12 meses, o si su hardware es posterio
 Este software es distribuido bajo los t&eacuterminos de la <A HREF="#license">Licencia MIT X11 / X Consortium</A> y es provisto sin garant&iacutea alguna y en el estado en que se encuentra. Por favor lea la <A HREF="#license">Licencia</A> antes de utilizarlo.</blockquote>
 
 <h2><a NAME="usage">Modo de uso</a></h2>
-<p>XFree86 es una implementaci&oacuten open-source de distribuci&oacuten libre del <a HREF
-="http://www.x.org/">X Window System</a> producido por <a HREF="http://www.XFree86.Org/">XFree86 Project, Inc.</a> El window server para Darwin y Mac OS X provisto por XFree86 se llama XDarwin. XDarwin funciona en Mac OS X en modo pantalla completa o en modo rootless (integrado al escritorio).</p>
+<p>XDarwin es una X server open-source de distribuci&oacuten libre del <a HREF
+="http://www.x.org/">X Window System</a>. This version of XDarwin was produced by the X_VENDOR_LINK. XDarwin funciona en Mac OS X en modo pantalla completa o en modo rootless (integrado al escritorio).</p>
 <p>En modo pantalla completa, el X window system toma control total de la pantalla mientras esta activo. Presionando Command-Option-A  puede regresar al Escritorio de Mac OS X. Esta combinaci&oacuten de teclas puede cambiarse en las Preferencias de Usuario. Desde el Escritorio de Mac OS X, haga click en &iacutecono de XDarwin en el Dock para volver al X window system.  (Puede cambiar esta comportamiento en las Preferencias de Usuario y configurar que XDarwin vuelva al X window system haciendo click en la ventana flotante con el logo X.)</p>
 <p>En modo rootless, el X window system comparte la pantalla con Aqua. La ventana root de X11 es del tama&ntildeo de la pantalla y contiene a todas las dem&aacutes ventanas. La ventana root de X11 no se muestra en este modo, ya que Aqua maneja el fondo de pantalla.</p>
 <h3>Emulaci&oacuten de mouse multi-bot&oacuten</h3>
@@ -47,7 +42,7 @@ Este software es distribuido bajo los t&eacuterminos de la <A HREF="#license">Li
 <h2><a NAME="path">Configurando su Path</a></h2>
 <p>El path es la lista de directorios donde se buscar&aacuten los comandos ejecutables. Los comandos de X11 se encuentran en  <code>/usr/X11R6/bin</code>, y &eacuteste necesita estar dentro de su path. XDarwin hace &eacutesto autom&aacuteticamente por defecto, y puede adem&aacutes agregar directorios adicionales donde tenga otros comandos de l&iacutenea.</p>
 <p>Usuarios experimentados pueden tener su path correctamente configurado mediante los archivos de inicio de su interprete de comandos.  En este caso, puede informarle a XDarwin en las Preferencias de Usuario para que no modifique su path. XDarwin arrancar&aacute los clientes X11 iniciales usando el int&eacuterprete de comandos del usuario, seg&uacuten su configuraci&oacuten de login. Un int&eacuterprete de comandos alternativo puede ser especificado en las Preferencias del Usuario. La manera de configurar el path de su int&eacuterprete de comandos depende de cual est&aacute usando, y es generalmente descripta en las p&aacuteginas man del mismo.</p>
-<p>Adem&aacutes, Ud. puede agregar las p&aacuteginas man de XFree86 a la lista de p&aacuteginas que son consultadas. Estas est&aacuten ubicadas en <code>/usr/X11R6/man</code> y <code>MANPATH</code> es la variable de entorno que contiene los directorios que son consultados.</p>
+<p>Adem&aacutes, Ud. puede agregar las p&aacuteginas man de X11 a la lista de p&aacuteginas que son consultadas. Estas est&aacuten ubicadas en <code>/usr/X11R6/man</code> y <code>MANPATH</code> es la variable de entorno que contiene los directorios que son consultados.</p>
 
 <h2><a NAME="prefs">Preferencias del Usuario</a></h2>
 <p>Ciertas opciones pueden definirse dentro de "Preferencias...", en el men&uacute de XDarwin. Las opciones dentro de de "Inicio" no surtir&aacuten efecto hasta que la aplicaci&oacuten se reinicie. Las restantes opciones surten efecto inmediatamente. Las diferentes opciones se describen a continuaci&oacuten:</p>
@@ -75,7 +70,7 @@ Este software es distribuido bajo los t&eacuterminos de la <A HREF="#license">Li
 </ul>
 
 <h2><a NAME="license">Licencia</a></h2>
-El XFree86 Project esta comprometido en proveer versiones binarias y en c&oacutedigo fuente de distribuci&oacuten libre. La licencia principal que utilizamos es una basada en la Licencia MIT X11 tradicional, que no impone condiciones a la modificaci&oacuten o redistribuci&oacuten del c&oacutedigo fuente o de archivos binarios m&aacutes all&aacute de requerir que los mensajes de Licencia y Copyright se mantengan intactos. Para mayor informaci&oacuten y para mensajes adicionales de Licencia y Copyright que cubren algunas secciones del c&oacutedigo fuente, por favor consulte la <A HREF="http://www.xfree86.org/legal/licence.html">P&aacutegina de Licencia de XFree86</A>.
+La licencia principal de XDarwin es basada en la Licencia MIT X11 tradicional, que no impone condiciones a la modificaci&oacuten o redistribuci&oacuten del c&oacutedigo fuente o de archivos binarios m&aacutes all&aacute de requerir que los mensajes de Licencia y Copyright se mantengan intactos. Para mayor informaci&oacuten y para mensajes adicionales de Licencia y Copyright que cubren algunas secciones del c&oacutedigo fuente, por favor consulte the source code.
 <H3><A NAME="3"></A>Licencia del X Consortium</H3>
 <p>Copyright (C) 1996 X Consortium</p>
 <p>Se otorga aqui permiso, libre de costo, a toda persona que obtenga una copia de este Software y los archivos de documentaci&oacuten asociados (el "Software"),
diff --git a/hw/darwin/bundle/Swedish.lproj/Credits.rtf b/hw/darwin/bundle/Swedish.lproj/Credits.rtf
index 2bf7a8eaf..34408e78c 100644
--- a/hw/darwin/bundle/Swedish.lproj/Credits.rtf
+++ b/hw/darwin/bundle/Swedish.lproj/Credits.rtf
@@ -5,10 +5,20 @@
 \vieww5160\viewh6300\viewkind0
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
 
-\f0\fs24 \cf0 This product  includes software developed by The XFree86 Project, Inc  (http://www.xfree86.org/) and its contributors. The following people contributed to Darwin/Mac OS X support.\
+\f0\fs24 \cf0 This product includes software developed by The XFree86 Project, Inc  (http://www.xfree86.org/) and its contributors. The following people contributed to Darwin/Mac OS X support.\
 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
 
+\f1\b \cf0 Contributors to Xorg Foundation Release:
+\f0\b0 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
+\cf0 Kaleb KEITHLEY\
+     
+\f2\i Working left and right Ctrl, Alt (Option), Meta (Command) and Shift keys.
+\f0\i0 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
+
+\f1\b \cf0 \
 \f1\b \cf0 Contributors to XFree86 4.4:
 \f0\b0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
diff --git a/hw/darwin/bundle/Swedish.lproj/MainMenu.nib/objects.nib b/hw/darwin/bundle/Swedish.lproj/MainMenu.nib/objects.nib
index 116e0b316..3157d72cb 100644
--- a/hw/darwin/bundle/Swedish.lproj/MainMenu.nib/objects.nib
+++ b/hw/darwin/bundle/Swedish.lproj/MainMenu.nib/objects.nib
diff --git a/hw/darwin/bundle/Swedish.lproj/XDarwinHelp.html.cpp b/hw/darwin/bundle/Swedish.lproj/XDarwinHelp.html.cpp
index ee099d1a0..4210878c0 100644
--- a/hw/darwin/bundle/Swedish.lproj/XDarwinHelp.html.cpp
+++ b/hw/darwin/bundle/Swedish.lproj/XDarwinHelp.html.cpp
@@ -1,19 +1,14 @@
-<!-- $XFree86: xc/programs/Xserver/hw/darwin/bundle/Swedish.lproj/XDarwinHelp.html.cpp,v 1.2 2001/11/07 22:43:27 torrey Exp $ -->
-
-#include "xf86Version.h"
-#ifndef PRE_RELEASE
-#define PRE_RELEASE XF86_VERSION_SNAP
-#endif
+<!-- $XFree86: xc/programs/Xserver/hw/darwin/bundle/English.lproj/XDarwinHelp.html.cpp,v 1.2 2001/11/04 07:02:28 torrey Exp $ -->
 
 <html>
 <head>
-<title>XFree86 f&ouml;r Mac OS X</title>
+<title>XDarwin Help</title>
 </head>
 <body>
 <center>
-    <h1>XFree86 f&ouml;r Darwin och Mac OS X</h1>
-    XFree86 XF86_VERSION<br>
-    F&auml;rdigst&auml;llt: XF86_REL_DATE
+    <h1>XDarwin X Server for Mac OS X</h1>
+    X_VENDOR_NAME X_VERSION<br>
+    F&auml;rdigst&auml;llt: X_REL_DATE
 </center>
 <h2>Inneh&aring;ll</h2>
 <ol>
@@ -28,7 +23,7 @@
 </center>
 <blockquote>
 #if PRE_RELEASE
-Detta &auml;r en testversion av XFree86, och du kan inte garranteras n&aring;gon som helst support f&ouml;r den. Buggar och fel kan rapporteras och f&ouml;rslag till fixar kan skickas till <A HREF="http://sourceforge.net/projects/xonx/">XonX-projektets sida</A> p&aring; SourceForge.  Innan du rapporterar buggar i testversioner, var god pr&ouml;va den senaste versionen fr&aring;n <A HREF="http://sourceforge.net/projects/xonx/">XonX</A> eller i <A HREF="http://www.XFree86.Org/cvs">XFree86 CVS-arkiv</A>.
+Detta &auml;r en testversion av XDarwin, och du kan inte garranteras n&aring;gon som helst support f&ouml;r den. Buggar och fel kan rapporteras och f&ouml;rslag till fixar kan skickas till <A HREF="http://sourceforge.net/projects/xonx/">XonX-projektets sida</A> p&aring; SourceForge.  Innan du rapporterar buggar i testversioner, var god pr&ouml;va den senaste versionen fr&aring;n <A HREF="http://sourceforge.net/projects/xonx/">XonX</A> eller i X_VENDOR_LINK.
 #else
 Om servern &auml;r &auml;ldre &auml;n 6-12 m&aring;nader, eller om din h&aring;rdvara &auml;r nyare &auml;n datumet ovan, leta efter en nyare version innan du rapporterar fel. Buggar och fel kan rapporteras och f&ouml;rslag till fixar kan skickas till <A HREF="http://sourceforge.net/projects/xonx/">XonX-projektets sida</A> p&aring; SourceForge.
 #endif
@@ -37,8 +32,8 @@ Om servern &auml;r &auml;ldre &auml;n 6-12 m&aring;nader, eller om din h&aring;r
 Denna programvara distrubueras i enlighet med <A HREF="#license">MIT X11 / X Consortium License</A> och tilhandh&aring;lls som den &auml;r, helt utan garantier. Var god l&auml;s igenom <A HREF="#license">licensdokumentet (engelska)</A> innan du anv&auml;nder programmet.</blockquote>
 
 <h2><a NAME="usage">Anv&auml;ndande</a></h2>
-<p>XFree86 &auml;r en fritt spridd implemenation av <a HREF
-="http://www.x.org/">X Window-systemet</a> producerad av <a HREF="http://www.XFree86.Org/">XFree86 Project, Inc</a>, med &ouml;ppen k&auml;llkod. Den X Window-server f&ouml;r Darwin och Mac OS X som tillhandah&aring;lls av XFree86 kallas XDarwin. XDarwin kan k&ouml;ras p&aring; Mac OS X i fullsk&auml;rmsl&auml;ge eller rotl&ouml;st l&auml;ge.</p>
+<p>XDarwin &auml;r en fritt spridd X server av <a HREF
+="http://www.x.org/">X Window-systemet</a>. This version of XDarwin was produced by the X_VENDOR_LINK. XDarwin kan k&ouml;ras p&aring; Mac OS X i fullsk&auml;rmsl&auml;ge eller rotl&ouml;st l&auml;ge.</p>
 <p>I fullsk&auml;rmsl&auml;ge kommer X window-systemet att ta &ouml;ver hela sk&auml;rmen n&auml;r det &auml;r aktivt. Du kan byta tillbaka till Mac OS Xs skrivbord genom att trycka Kommando-Alt-A. Denna tangentkombination kan &auml;ndra i inst&auml;llningarna. N&auml;r du &auml;r p&aring; Mac OS Xs skrivbord kan du klicka p&aring; XDarwin-ikonen i dockan f&ouml;r att byta tillbaka till X Window-systemet. (Du kan f&ouml;r&auml;ndra detta beteende i inst&auml;llningarna s&aring; att du ist&auml;llet m&aring;ste klicka i det fltande bytesf&ouml;nstret ist&auml;llet.)</p>
 <p>I rotl&ouml;stl&auml;ge delar X11 och Aqua p&aring; din sk&auml;rm. Rotf&ouml;nstret p&aring; X11-sk&auml;rmen &auml;r av samma storlek som hela sk&auml;rmen och inneh&aring;ller alla andra f&ouml;nster - det fungerar som bakgrund. I rotl&ouml;stl&auml;ge visas inte detta rotf&ouml;nster, eftersom Aqua hanterar skrvbordbakgrunden.</p>
 
@@ -49,7 +44,7 @@ Denna programvara distrubueras i enlighet med <A HREF="#license">MIT X11 / X Con
 <p>Din s&ouml;kv&auml;g &auml;r en lista av kataloger som s&ouml;ks igenom n&auml;r terminalen letar efter kommandon att exekvera. Kommandon som h&ouml;r till X11 ligger i <code>/usr/X11R6/bin</code>, en katalog som inte ligger i din s&ouml;kv&auml;g fr&aring;n b&ouml;rjan. XDarwin l&auml;gger till denna katalog &aring;t dig, och du kan ocks&aring; l&auml;gga till ytterligare kataloger i vilka du lagt program som skall k&ouml;ras fr&aring;n kommandoraden.</p>
 <p>Mer erfarna anv&auml;ndare har antagligen redan st&auml;llt in sin s&ouml;kv&auml;g i skalets inst&auml;llningsfiler. Om detta g&auml;ller dig  kan st&auml;lla in XDarwin s&aring; att din s&ouml;kv&auml;g inte modifieras. XDarwin startar de f&ouml;rsta X11-klienterna i anv&auml;ndarens inloggningsskal (Vill du anv&auml;nda ett alternativt skall, kan du specificera detta i inst&auml;llningarna). Hur du st&auml;ller in din s&ouml;kv&auml;g beror p&aring; vilket skal du anv&auml;nder. Exakt hur beskrivs i skalets man-sidor.</p>
 
-<p>Ut&ouml;ver detta kan du ocks&aring; vilja l&auml;gga till XFree86s man-sidor (dokumentation) till listan &auml;ver sidor som som skall s&ouml;kas n&auml;r du vill l&auml;sa efter dokumentationen. X11s man-sidor ligger i <code>/usr/X11R6/man</code> och listan &auml;ver kataloger att s&ouml;ka best&auml;mms av variabeln<code>MANPATH</code>.</p>
+<p>Ut&ouml;ver detta kan du ocks&aring; vilja l&auml;gga till X11s man-sidor (dokumentation) till listan &auml;ver sidor som som skall s&ouml;kas n&auml;r du vill l&auml;sa efter dokumentationen. X11s man-sidor ligger i <code>/usr/X11R6/man</code> och listan &auml;ver kataloger att s&ouml;ka best&auml;mms av variabeln<code>MANPATH</code>.</p>
 
 <h2><a NAME="prefs">Inst&auml;llningar</a></h2>
 <p>I inst&auml;llningarna finns ett antal alternativ d&auml;r du kan p&aring;verka hur XDarwin beter sig i vissa fall. Inst&auml;llningarna kommer du till genom att v&auml;lja "Inst&auml;llningar..." i menyn "XDarwin". De alternativ som finns under fliken "Starta" tr&auml;der inte i kraft f&ouml;rr&auml;n du startat om programmet. Alla andra alternativ tr&auml;der i kraft omedelbart. De olika alternativen beskrivs nedan:</p>
@@ -77,10 +72,10 @@ Denna programvara distrubueras i enlighet med <A HREF="#license">MIT X11 / X Con
 </ul>
 
 <h2><a NAME="license">Licens (svenska)</a></h2>
-<p>XFree86-projektet &aring;tar sig att tillhandah&aring;lla programvara och k&auml;llkod i format som fritt kan spridas vidare. Den huvudsakliga licens vi anv&auml;nder oss av &auml;r baserad p&aring; den traditionella MIT X11 / XConsortium-licensen, vilken inte p&aring; n&aring;got s&auml;tt begr&auml;nsar f&ouml;r&auml;ndringar eller vidarespridning av vare sig k&auml;llkod eller kompilerad programvara annat &auml;n genom att kr&auml;va att delarna som r&ouml;r copyright och licensiering l&auml;mnas intakta. F&ouml;r mer information och ytterligare copyright/licensieringsinfromation r&ouml;rande vissa speciella delar av koden, se <A HREF="http://www.xfree86.org/legal/licence.html">XFree86-licenssida</A> (engelska).</p>
+<p>Den huvudsakliga licens vi anv&auml;nder oss av &auml;r baserad p&aring; den traditionella MIT X11 / XConsortium-licensen, vilken inte p&aring; n&aring;got s&auml;tt begr&auml;nsar f&ouml;r&auml;ndringar eller vidarespridning av vare sig k&auml;llkod eller kompilerad programvara annat &auml;n genom att kr&auml;va att delarna som r&ouml;r copyright och licensiering l&auml;mnas intakta. F&ouml;r mer information och ytterligare copyright/licensieringsinfromation r&ouml;rande vissa speciella delar av koden, se the source code.</p>
 
 <h3>Licence (english)</h3>
-<p>The XFree86 Project is committed to providing freely redistributable binary and source releases. The main license we use is one based on the traditional MIT X11 / X Consortium License, which does not impose any conditions on modification or redistribution of source code or binaries other than requiring that copyright/license notices are left intact. For more information and additional copyright/licensing notices covering some sections of the code, please see the <A HREF="http://www.xfree86.org/legal/licence.html">XFree86 License page</A>.</p>
+<p>The main license for XDarwin is based on the traditional MIT X11 / X Consortium License, which does not impose any conditions on modification or redistribution of source code or binaries other than requiring that copyright/license notices are left intact. For more information and additional copyright/licensing notices covering some sections of the code, please refer to the source code.</p>
 
 <H3><A NAME="3"></A>X Consortium License</H3>
 <p>Copyright (C) 1996 X Consortium</p>
diff --git a/hw/darwin/bundle/XDarwin.icns b/hw/darwin/bundle/XDarwin.icns
index 31dc1bdf9..9c560846e 100644
--- a/hw/darwin/bundle/XDarwin.icns
+++ b/hw/darwin/bundle/XDarwin.icns
diff --git a/hw/darwin/bundle/ko.lproj/Credits.rtf b/hw/darwin/bundle/ko.lproj/Credits.rtf
index 2bf7a8eaf..34408e78c 100644
--- a/hw/darwin/bundle/ko.lproj/Credits.rtf
+++ b/hw/darwin/bundle/ko.lproj/Credits.rtf
@@ -5,10 +5,20 @@
 \vieww5160\viewh6300\viewkind0
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
 
-\f0\fs24 \cf0 This product  includes software developed by The XFree86 Project, Inc  (http://www.xfree86.org/) and its contributors. The following people contributed to Darwin/Mac OS X support.\
+\f0\fs24 \cf0 This product includes software developed by The XFree86 Project, Inc  (http://www.xfree86.org/) and its contributors. The following people contributed to Darwin/Mac OS X support.\
 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
 
+\f1\b \cf0 Contributors to Xorg Foundation Release:
+\f0\b0 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
+\cf0 Kaleb KEITHLEY\
+     
+\f2\i Working left and right Ctrl, Alt (Option), Meta (Command) and Shift keys.
+\f0\i0 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
+
+\f1\b \cf0 \
 \f1\b \cf0 Contributors to XFree86 4.4:
 \f0\b0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
diff --git a/hw/darwin/bundle/ko.lproj/MainMenu.nib/objects.nib b/hw/darwin/bundle/ko.lproj/MainMenu.nib/objects.nib
index ab141ba99..8f9b5e01c 100644
--- a/hw/darwin/bundle/ko.lproj/MainMenu.nib/objects.nib
+++ b/hw/darwin/bundle/ko.lproj/MainMenu.nib/objects.nib
diff --git a/hw/darwin/bundle/ko.lproj/XDarwinHelp.html.cpp b/hw/darwin/bundle/ko.lproj/XDarwinHelp.html.cpp
index 4c83fe278..5996285ae 100644
--- a/hw/darwin/bundle/ko.lproj/XDarwinHelp.html.cpp
+++ b/hw/darwin/bundle/ko.lproj/XDarwinHelp.html.cpp
@@ -1,19 +1,14 @@
-<!-- $XFree86: xc/programs/Xserver/hw/darwin/bundle/ko.lproj/XDarwinHelp.html.cpp,v 1.1 2001/12/04 03:36:39 torrey Exp $ -->
-
-#include "xf86Version.h"
-#ifndef PRE_RELEASE
-#define PRE_RELEASE XF86_VERSION_SNAP
-#endif
+<!-- $XFree86: xc/programs/Xserver/hw/darwin/bundle/English.lproj/XDarwinHelp.html.cpp,v 1.1 2001/05/21 01:42:17 torrey Exp $ -->
 
 <html>
 <head>
-<title>XFree86 for Mac OS X</title>
+<title>XDarwin Help</title>
 </head>
 <body>
 <center>
-    <h1>XFree86 on Darwin and Mac OS X</h1>
-    XFree86 XF86_VERSION<br>
-    Release Date: XF86_REL_DATE
+    <h1>XDarwin X Server for Mac OS X</h1>
+    X_VENDOR_NAME X_VERSION<br>
+    Release Date: X_REL_DATE
 </center>
 <h2>Contents</h2>
 <ol>
@@ -27,8 +22,8 @@
     <h2><a NAME="notice">Important Notice</a></h2>
 </center>
 <blockquote>
-#if PRE_RELEASE
-This is a pre-release version of XFree86, and is not supported in any way. Bugs may be reported and patches may be submitted to the <A HREF="http://sourceforge.net/projects/xonx/">XonX project page</A> at SourceForge.  Before reporting bugs in pre-release versions, please check the latest version from <A HREF="http://sourceforge.net/projects/xonx/">XonX</A> or in the <A HREF="http://www.XFree86.Org/cvs">XFree86 CVS repository</A>.
+#if X_PRE_RELEASE
+This is a pre-release version of XDarwin, and is not supported in any way. Bugs may be reported and patches may be submitted to the <A HREF="http://sourceforge.net/projects/xonx/">XonX project page</A> at SourceForge.  Before reporting bugs in pre-release versions, please check the latest version from <A HREF="http://sourceforge.net/projects/xonx/">XonX</A> or the X_VENDOR_LINK.
 #else
 If the server is older than 6-12 months, or if your hardware is newer than the above date, look for a newer version before reporting problems. Bugs may be reported and patches may be submitted to the <A HREF="http://sourceforge.net/projects/xonx/">XonX project page</A> at SourceForge.
 #endif
@@ -37,8 +32,7 @@ If the server is older than 6-12 months, or if your hardware is newer than the a
 This software is distributed under the terms of the <A HREF="#license">MIT X11 / X Consortium License</A> and is provided AS IS, with no warranty. Please read the <A HREF="#license">License</A> before using.</blockquote>
 
 <h2><a NAME="usage">Usage</a></h2>
-<p>XFree86 is a freely redistributable open-source implementation of the <a HREF
-="http://www.x.org/">X Window System</a> produced by the <a HREF="http://www.XFree86.Org/">XFree86 Project, Inc.</a> The X window server for Darwin and Mac OS X provided by XFree86 is called XDarwin. XDarwin runs on Mac OS X in full screen or rootless modes.</p>
+<p>XDarwin is a freely redistributable open-source X server for the <a HREF="http://www.x.org/">X Window System</a>. This version of XDarwin was produced by the X_VENDOR_LINK. XDarwin runs on Mac OS X in full screen or rootless modes.</p>
 <p>In full screen mode, when the X window system is active, it takes over the entire screen. You can switch back to the Mac OS X desktop by holding down Command-Option-A. This key combination can be changed in the user preferences. From the Mac OS X desktop, click on the XDarwin icon in the Dock to switch back to the X window system.  (You can change this behavior in the user preferences so that you must click the XDarwin icon in the floating switch window instead.)</p>
 <p>In rootless mode, the X window system and Aqua share your display. The root window of the X11 display is the size of the screen and contains all the other windows. The X11 root window is not displayed in rootless mode as Aqua handles the desktop background.</p>
 <h3>Multi-Button Mouse Emulation</h3>
@@ -47,7 +41,7 @@ This software is distributed under the terms of the <A HREF="#license">MIT X11 /
 <h2><a NAME="path">Setting Your Path</a></h2>
 <p>Your path is the list of directories to be searched for executable commands. The X11 commands are located in <code>/usr/X11R6/bin</code>, which needs to be added to your path. XDarwin does this for you by default and can also add additional directories where you have installed command line applications.</p>
 <p>More experienced users will have already set their path correctly using the initialization files for their shell. In this case, you can inform XDarwin not to modify your path in the preferences. XDarwin launches the initial X11 clients in the user's default login shell. (An alternate shell can also be specified in the preferences.) The way to set the path depends on the shell you are using. This is described in the man page documentation for the shell.</p>
-<p>In addition you may also want to add the man pages from XFree86 to the list of pages to be searched when you are looking for documentation. The X11 man pages are located in <code>/usr/X11R6/man</code> and the <code>MANPATH</code> environment variable contains the list of directories to search.</p>
+<p>In addition you may also want to add the X11 man pages to the list of pages to be searched when you are looking for documentation. The X11 man pages are located in <code>/usr/X11R6/man</code> and the <code>MANPATH</code> environment variable contains the list of directories to search.</p>
 
 <h2><a NAME="prefs">User Preferences</a></h2>
 <p>A number of options may be set from the user preferences, accessible from the "Preferences..." menu item in the "XDarwin" menu. The options listed as start up options will not take effect until you have restarted XDarwin. All other options take effect immediately. The various options are described below:</p>
@@ -75,8 +69,7 @@ This software is distributed under the terms of the <A HREF="#license">MIT X11 /
 </ul>
 
 <h2><a NAME="license">License</a></h2>
-The XFree86 Project is committed to providing freely redistributable binary and source releases. The main license we use is one based on the traditional MIT X11 / X Consortium License, which does not impose any conditions on modification or redistribution of source code or binaries other than requiring that copyright/license notices are left intact. For more information and additional copyright/licensing notices covering some sections of the code, please see the <A HREF="http://www.xfree86.org/legal/licence.html">XFree86
-License page</A>.
+The main license for XDarwin is based on the traditional MIT X11 / X Consortium License, which does not impose any conditions on modification or redistribution of source code or binaries other than requiring that copyright/license notices are left intact. For more information and additional copyright/licensing notices covering some sections of the code, please refer to the source code.
 <H3><A NAME="3"></A>X Consortium License</H3>
 <p>Copyright (C) 1996 X Consortium</p>
 <p>Permission is hereby granted, free of charge, to any person obtaining a 
diff --git a/hw/darwin/bundle/startXClients.cpp b/hw/darwin/bundle/startXClients.cpp
index b27ad46fe..51cdb5c9e 100644
--- a/hw/darwin/bundle/startXClients.cpp
+++ b/hw/darwin/bundle/startXClients.cpp
@@ -3,7 +3,7 @@ XCOMM!/bin/sh
 XCOMM This script is used by XDarwin to start X clients when XDarwin is
 XCOMM launched from the Finder.
 XCOMM
-XCOMM $XFree86: xc/programs/Xserver/hw/darwin/bundle/startXClients.cpp,v 1.1 2001/10/18 05:03:42 torrey Exp $
+XCOMM $XFree86: $
 
 userclientrc=$HOME/.xinitrc
 sysclientrc=XINITDIR/xinitrc
diff --git a/hw/darwin/darwin.c b/hw/darwin/darwin.c
index bf0975769..caf32c5df 100644
--- a/hw/darwin/darwin.c
+++ b/hw/darwin/darwin.c
@@ -5,7 +5,7 @@
  *
  **************************************************************/
 /*
- * Copyright (c) 2001-2003 Torrey T. Lyons. All Rights Reserved.
+ * Copyright (c) 2001-2004 Torrey T. Lyons. All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -29,7 +29,8 @@
  * holders shall not be used in advertising or otherwise to promote the sale,
  * use or other dealings in this Software without prior written authorization.
  */
-/* $XFree86: xc/programs/Xserver/hw/darwin/darwin.c,v 1.56 2003/11/24 05:39:01 torrey Exp $ */
+/* $XdotOrg: xc/programs/Xserver/hw/darwin/darwin.c,v 1.1.4.2.4.1.6.3 2004/04/20 03:27:08 gisburn Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/darwin/darwin.c,v 1.55 2003/11/15 00:07:09 torrey Exp $ */
 
 #include "X.h"
 #include "Xproto.h"
@@ -43,7 +44,7 @@
 #include "fb.h"			// fb framebuffer code
 #include "site.h"
 #include "globals.h"
-#include "xf86Version.h"
+#include "xorgVersion.h"
 #include "xf86Date.h"
 #include "dix.h"
 
@@ -54,6 +55,9 @@
 #include <fcntl.h>
 #include <unistd.h>
 
+#define HAS_UTSNAME 1
+#include <sys/utsname.h>
+
 #define NO_CFPLUGIN
 #include <IOKit/IOKitLib.h>
 #include <IOKit/hidsystem/IOHIDLib.h>
@@ -109,7 +113,7 @@ const int NUMFORMATS = sizeof(formats)/sizeof(formats[0]);
 #define OSVENDOR ""
 #endif
 #ifndef PRE_RELEASE
-#define PRE_RELEASE XF86_VERSION_SNAP
+#define PRE_RELEASE XORG_VERSION_SNAP
 #endif
 
 void
@@ -117,37 +121,74 @@ DarwinPrintBanner()
 {
 #if PRE_RELEASE
   ErrorF("\n"
-    "This is a pre-release version of XFree86, and is not supported in any\n"
-    "way.  Bugs may be reported to XFree86@XFree86.Org and patches submitted\n"
-    "to fixes@XFree86.Org.  Before reporting bugs in pre-release versions,\n"
-    "please check the latest version in the XFree86 CVS repository\n"
-    "(http://www.XFree86.Org/cvs)\n");
+    "This is a pre-release version of the " XVENDORNAME " X11.\n"
+    "Portions of this release are based on XFree86 4.4RC2 and selected\n"
+    "files from XFree86 4.4RC3. It is not supported in any way.\n"
+    "Bugs may be filed in the bugzilla at http://bugs.freedesktop.org/.\n"
+    "Select the \"xorg\" product for bugs you find in this release.\n"
+    "Before reporting bugs in pre-release versions please check the\n"
+    "latest version in the " XVENDORNAME " \"monolithic tree\" CVS\n"
+    "repository hosted at http://www.freedesktop.org/Software/xorg/");
 #endif
-  ErrorF("\nXFree86 Version %d.%d.%d", XF86_VERSION_MAJOR, XF86_VERSION_MINOR,
-                                    XF86_VERSION_PATCH);
-#if XF86_VERSION_SNAP > 0
+#if XORG_VERSION_SNAP > 0
   ErrorF(".%d", XF86_VERSION_SNAP);
 #endif
 
-#if XF86_VERSION_SNAP >= 900
-  ErrorF(" (%d.%d.0 RC %d)", XF86_VERSION_MAJOR, XF86_VERSION_MINOR + 1,
-				XF86_VERSION_SNAP - 900);
+#if XORG_VERSION_SNAP >= 900
+  ErrorF(" (%d.%d.0 RC %d)", XORG_VERSION_MAJOR, XORG_VERSION_MINOR + 1,
+				XORG_VERSION_SNAP - 900);
 #endif
 
-#ifdef XF86_CUSTOM_VERSION
+#ifdef XORG_CUSTOM_VERSION
   ErrorF(" (%s)", XF86_CUSTOM_VERSION);
 #endif
-  ErrorF(" / X Window System\n");
-  ErrorF("(protocol Version %d, revision %d, vendor release %d)\n",
-         X_PROTOCOL, X_PROTOCOL_REVISION, VENDOR_RELEASE );
-  ErrorF("Release Date: %s\n", XF86_DATE);
-  ErrorF("\tIf the server is older than 6-12 months, or if your hardware is\n"
-         "\tnewer than the above date, look for a newer version before\n"
-         "\treporting problems.  (See http://www.XFree86.Org/FAQ)\n");
-  ErrorF("Operating System:%s%s\n", OSNAME, OSVENDOR);
+  ErrorF("\nRelease Date: %s\n", XF86_DATE);
+  ErrorF("X Protocol Version %d, Revision %d, %s\n",
+         X_PROTOCOL, X_PROTOCOL_REVISION, XORG_RELEASE );
+  ErrorF("Build Operating System:%s%s\n", OSNAME, OSVENDOR);
+#ifdef HAS_UTSNAME
+  {
+    struct utsname name;
+
+    if (uname(&name) == 0) {
+      ErrorF("Current Operating System: %s %s %s %s %s\n",
+	name.sysname, name.nodename, name.release, name.version, name.machine);
+    }
+  }
+#endif
+#if defined(BUILD_DATE) && (BUILD_DATE > 19000000)
+  {
+    struct tm t;
+    char buf[100];
+
+    bzero(&t, sizeof(t));
+    bzero(buf, sizeof(buf));
+    t.tm_mday = BUILD_DATE % 100;
+    t.tm_mon = (BUILD_DATE / 100) % 100 - 1;
+    t.tm_year = BUILD_DATE / 10000 - 1900;
+    if (strftime(buf, sizeof(buf), "%d %B %Y", &t))
+       ErrorF("Build Date: %s\n", buf);
+  }
+#endif
+#if defined(CLOG_DATE) && (CLOG_DATE > 19000000)
+  {
+    struct tm t;
+    char buf[100];
+
+    bzero(&t, sizeof(t));
+    bzero(buf, sizeof(buf));
+    t.tm_mday = CLOG_DATE % 100;
+    t.tm_mon = (CLOG_DATE / 100) % 100 - 1;
+    t.tm_year = CLOG_DATE / 10000 - 1900;
+    if (strftime(buf, sizeof(buf), "%d %B %Y", &t))
+       ErrorF("Changelog Date: %s\n", buf);
+  }
+#endif
 #if defined(BUILDERSTRING)
   ErrorF("%s \n",BUILDERSTRING);
 #endif
+  ErrorF("\tBefore reporting problems, check "__VENDORDWEBSUPPORT__"\n"
+	 "\tto make sure that you have the latest version.\n");
 }
 
 
@@ -656,6 +697,10 @@ void OsVendorInit(void)
     }
 }
 
+/* ddxInitGlobals - called by |InitGlobals| from os/util.c */
+void ddxInitGlobals(void)
+{
+}
 
 /*
  * ddxProcessArgument --
diff --git a/hw/darwin/darwin.h b/hw/darwin/darwin.h
index 79fa00ffc..e49c450ef 100644
--- a/hw/darwin/darwin.h
+++ b/hw/darwin/darwin.h
@@ -23,7 +23,7 @@
  * holders shall not be used in advertising or otherwise to promote the sale,
  * use or other dealings in this Software without prior written authorization.
  */
-/* $XFree86: xc/programs/Xserver/hw/darwin/darwin.h,v 1.20 2003/11/15 00:07:09 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/darwin/darwin.h,v 1.19 2003/10/16 23:50:08 torrey Exp $ */
 
 #ifndef _DARWIN_H
 #define _DARWIN_H
diff --git a/hw/darwin/darwinClut8.h b/hw/darwin/darwinClut8.h
index 68a7ad16f..06e7b71c5 100644
--- a/hw/darwin/darwinClut8.h
+++ b/hw/darwin/darwinClut8.h
@@ -1,7 +1,7 @@
 /*
  * Darwin default 8-bit Colormap for StaticColor
  */
-/* $XFree86: xc/programs/Xserver/hw/darwin/darwinClut8.h,v 1.2 2003/03/04 01:37:59 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/darwin/darwinClut8.h,v 1.1.8.1 2003/03/04 01:31:43 torrey Exp $ */
 
 #ifndef _DARWIN_CLUT8_
 #define _DARWIN_CLUT8_
diff --git a/hw/darwin/darwinEvents.c b/hw/darwin/darwinEvents.c
index ba1ec8fc2..49bb67a94 100644
--- a/hw/darwin/darwinEvents.c
+++ b/hw/darwin/darwinEvents.c
@@ -3,6 +3,7 @@
  */
 /*
 Copyright (c) 2002 Torrey T. Lyons. All Rights Reserved.
+Copyright 2004 Kaleb S. KEITHLEY. All Rights Reserved.
 
 This file is based on mieq.c by Keith Packard,
 which contains the following copyright:
@@ -28,7 +29,7 @@ Except as contained in this notice, the name of The Open Group shall not be
 used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
  */
-/* $XFree86: xc/programs/Xserver/hw/darwin/darwinEvents.c,v 1.5 2003/11/03 05:36:30 tsi Exp $ */
+/* $XFree86$ */
 
 #define NEED_EVENTS
 #include   "X.h"
@@ -93,6 +94,29 @@ static void DarwinPressModifierMask(
     }
 }
 
+#ifdef NX_DEVICELCTLKEYMASK
+#define CONTROL_MASK(flags) (flags & (NX_DEVICELCTLKEYMASK|NX_DEVICERCTLKEYMASK))
+#else
+#define CONTROL_MASK(flags) (NX_CONTROLMASK)
+#endif /* NX_DEVICELCTLKEYMASK */
+
+#ifdef NX_DEVICELSHIFTKEYMASK
+#define SHIFT_MASK(flags) (flags & (NX_DEVICELSHIFTKEYMASK|NX_DEVICERSHIFTKEYMASK))
+#else
+#define SHIFT_MASK(flags) (NX_SHIFTMASK)
+#endif /* NX_DEVICELSHIFTKEYMASK */
+
+#ifdef NX_DEVICELCMDKEYMASK
+#define COMMAND_MASK(flags) (flags & (NX_DEVICELCMDKEYMASK|NX_DEVICERCMDKEYMASK))
+#else
+#define COMMAND_MASK(flags) (NX_COMMANDMASK)
+#endif /* NX_DEVICELCMDKEYMASK */
+
+#ifdef NX_DEVICELALTKEYMASK
+#define ALTERNATE_MASK(flags) (flags & (NX_DEVICELALTKEYMASK|NX_DEVICERALTKEYMASK))
+#else
+#define ALTERNATE_MASK(flags) (NX_ALTERNATEMASK)
+#endif /* NX_DEVICELALTKEYMASK */
 
 /*
  * DarwinUpdateModifiers
@@ -108,16 +132,16 @@ static void DarwinUpdateModifiers(
         DarwinPressModifierMask(xe, NX_ALPHASHIFTMASK);
     }
     if (flags & NX_COMMANDMASK) {
-        DarwinPressModifierMask(xe, NX_COMMANDMASK);
+        DarwinPressModifierMask(xe, COMMAND_MASK(flags));
     }
     if (flags & NX_CONTROLMASK) {
-        DarwinPressModifierMask(xe, NX_CONTROLMASK);
+        DarwinPressModifierMask(xe, CONTROL_MASK(flags));
     }
     if (flags & NX_ALTERNATEMASK) {
-        DarwinPressModifierMask(xe, NX_ALTERNATEMASK);
+        DarwinPressModifierMask(xe, ALTERNATE_MASK(flags));
     }
     if (flags & NX_SHIFTMASK) {
-        DarwinPressModifierMask(xe, NX_SHIFTMASK);
+        DarwinPressModifierMask(xe, SHIFT_MASK(flags));
     }
     if (flags & NX_SECONDARYFNMASK) {
         DarwinPressModifierMask(xe, NX_SECONDARYFNMASK);
diff --git a/hw/darwin/darwinKeyboard.c b/hw/darwin/darwinKeyboard.c
index 57bf5fa3d..e60e7a3e1 100644
--- a/hw/darwin/darwinKeyboard.c
+++ b/hw/darwin/darwinKeyboard.c
@@ -2,6 +2,7 @@
 //
 // Keyboard support for the Darwin X Server
 //
+// Copyright 2004 Kaleb S. KEITHLEY. All Rights Reserved.
 // Copyright (c) 2001-2003 Torrey T. Lyons. All Rights Reserved.
 // Copyright (c) 2003 Apple Computer, Inc. All Rights Reserved.
 //
@@ -37,7 +38,7 @@
 //
 //=============================================================================
 
-/* $XFree86: xc/programs/Xserver/hw/darwin/darwinKeyboard.c,v 1.19 2003/11/01 08:13:08 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/darwin/darwinKeyboard.c,v 1.18 2003/05/14 05:27:55 torrey Exp $ */
 
 /*
 ===========================================================================
@@ -656,7 +657,6 @@ Bool DarwinParseNXKeyMapping(
     return TRUE;
 }
 
-
 /*
  * DarwinBuildModifierMaps
  *      Use the keyMap field of keyboard info structure to populate
@@ -684,7 +684,11 @@ DarwinBuildModifierMaps(
                 break;
 
             case XK_Shift_R:
-                info->modifierKeycodes[NX_MODIFIERKEY_SHIFT][1] = i;
+#ifdef NX_MODIFIERKEY_RSHIFT
+                info->modifierKeycodes[NX_MODIFIERKEY_RSHIFT][0] = i;
+#else
+                info->modifierKeycodes[NX_MODIFIERKEY_SHIFT][0] = i;
+#endif
                 info->modMap[MIN_KEYCODE + i] = ShiftMask;
                 break;
 
@@ -694,7 +698,11 @@ DarwinBuildModifierMaps(
                 break;
 
             case XK_Control_R:
-                info->modifierKeycodes[NX_MODIFIERKEY_CONTROL][1] = i;
+#ifdef NX_MODIFIERKEY_RCONTROL
+                info->modifierKeycodes[NX_MODIFIERKEY_RCONTROL][0] = i;
+#else
+                info->modifierKeycodes[NX_MODIFIERKEY_CONTROL][0] = i;
+#endif
                 info->modMap[MIN_KEYCODE + i] = ControlMask;
                 break;
 
@@ -709,7 +717,11 @@ DarwinBuildModifierMaps(
                 break;
 
             case XK_Alt_R:
-                info->modifierKeycodes[NX_MODIFIERKEY_ALTERNATE][1] = i;
+#ifdef NX_MODIFIERKEY_RALTERNATE
+                info->modifierKeycodes[NX_MODIFIERKEY_RALTERNATE][0] = i;
+#else
+                info->modifierKeycodes[NX_MODIFIERKEY_ALTERNATE][0] = i;
+#endif
                 info->modMap[MIN_KEYCODE + i] = Mod1Mask;
                 break;
 
@@ -723,7 +735,11 @@ DarwinBuildModifierMaps(
                 break;
 
             case XK_Meta_R:
-                info->modifierKeycodes[NX_MODIFIERKEY_COMMAND][1] = i;
+#ifdef NX_MODIFIERKEY_RCOMMAND
+                info->modifierKeycodes[NX_MODIFIERKEY_RCOMMAND][0] = i;
+#else
+                info->modifierKeycodes[NX_MODIFIERKEY_COMMAND][0] = i;
+#endif
                 info->modMap[MIN_KEYCODE + i] = Mod2Mask;
                 break;
 
@@ -750,11 +766,6 @@ DarwinBuildModifierMaps(
                 break;
 	    }
         }
-
-#if ALT_IS_MODE_SWITCH
-        if (k[0] == XK_Alt_L || k[0] == XK_Alt_R)
-	    k[0] = XK_Mode_switch;
-#endif
     }
 }
 
@@ -844,14 +855,30 @@ int DarwinModifierNXKeycodeToNXKey(unsigned char keycode, int *outSide)
 int DarwinModifierNXMaskToNXKey(int mask)
 {
     switch (mask) {
-        case NX_ALPHASHIFTMASK:  return NX_MODIFIERKEY_ALPHALOCK;
-        case NX_SHIFTMASK:       return NX_MODIFIERKEY_SHIFT;
-        case NX_CONTROLMASK:     return NX_MODIFIERKEY_CONTROL;
-        case NX_ALTERNATEMASK:   return NX_MODIFIERKEY_ALTERNATE;
-        case NX_COMMANDMASK:     return NX_MODIFIERKEY_COMMAND;
-        case NX_NUMERICPADMASK:  return NX_MODIFIERKEY_NUMERICPAD;
-        case NX_HELPMASK:        return NX_MODIFIERKEY_HELP;
-        case NX_SECONDARYFNMASK: return NX_MODIFIERKEY_SECONDARYFN;
+        case NX_ALPHASHIFTMASK:       return NX_MODIFIERKEY_ALPHALOCK;
+        case NX_SHIFTMASK:            return NX_MODIFIERKEY_SHIFT;
+#ifdef NX_DEVICELSHIFTKEYMASK
+        case NX_DEVICELSHIFTKEYMASK:  return NX_MODIFIERKEY_SHIFT;
+        case NX_DEVICERSHIFTKEYMASK:  return NX_MODIFIERKEY_RSHIFT;
+#endif
+        case NX_CONTROLMASK:          return NX_MODIFIERKEY_CONTROL;
+#ifdef NX_DEVICELCTLKEYMASK
+        case NX_DEVICELCTLKEYMASK:    return NX_MODIFIERKEY_CONTROL;
+        case NX_DEVICERCTLKEYMASK:    return NX_MODIFIERKEY_RCONTROL;
+#endif
+        case NX_ALTERNATEMASK:        return NX_MODIFIERKEY_ALTERNATE;
+#ifdef NX_DEVICELALTKEYMASK
+        case NX_DEVICELALTKEYMASK:    return NX_MODIFIERKEY_ALTERNATE;
+        case NX_DEVICERALTKEYMASK:    return NX_MODIFIERKEY_RALTERNATE;
+#endif
+        case NX_COMMANDMASK:          return NX_MODIFIERKEY_COMMAND;
+#ifdef NX_DEVICELCMDKEYMASK
+        case NX_DEVICELCMDKEYMASK:    return NX_MODIFIERKEY_COMMAND;
+        case NX_DEVICERCMDKEYMASK:    return NX_MODIFIERKEY_RCOMMAND;
+#endif
+        case NX_NUMERICPADMASK:       return NX_MODIFIERKEY_NUMERICPAD;
+        case NX_HELPMASK:             return NX_MODIFIERKEY_HELP;
+        case NX_SECONDARYFNMASK:      return NX_MODIFIERKEY_SECONDARYFN;
     }
     return -1;
 }
@@ -865,9 +892,21 @@ int DarwinModifierNXKeyToNXMask(int key)
     switch (key) {
         case NX_MODIFIERKEY_ALPHALOCK:   return NX_ALPHASHIFTMASK;
         case NX_MODIFIERKEY_SHIFT:       return NX_SHIFTMASK;
+#ifdef NX_MODIFIERKEY_RSHIFT
+        case NX_MODIFIERKEY_RSHIFT:      return NX_SHIFTMASK;
+#endif
         case NX_MODIFIERKEY_CONTROL:     return NX_CONTROLMASK;
+#ifdef NX_MODIFIERKEY_RCONTROL
+        case NX_MODIFIERKEY_RCONTROL:    return NX_CONTROLMASK;
+#endif
         case NX_MODIFIERKEY_ALTERNATE:   return NX_ALTERNATEMASK;
+#ifdef NX_MODIFIERKEY_RALTERNATE
+        case NX_MODIFIERKEY_RALTERNATE:  return NX_ALTERNATEMASK;
+#endif
         case NX_MODIFIERKEY_COMMAND:     return NX_COMMANDMASK;
+#ifdef NX_MODIFIERKEY_RCOMMAND
+        case NX_MODIFIERKEY_RCOMMAND:    return NX_COMMANDMASK;
+#endif
         case NX_MODIFIERKEY_NUMERICPAD:  return NX_NUMERICPADMASK;
         case NX_MODIFIERKEY_HELP:        return NX_HELPMASK;
         case NX_MODIFIERKEY_SECONDARYFN: return NX_SECONDARYFNMASK;
diff --git a/hw/darwin/darwinKeyboard.h b/hw/darwin/darwinKeyboard.h
index c71888990..405dcf9d1 100644
--- a/hw/darwin/darwinKeyboard.h
+++ b/hw/darwin/darwinKeyboard.h
@@ -23,7 +23,7 @@
  * holders shall not be used in advertising or otherwise to promote the sale,
  * use or other dealings in this Software without prior written authorization.
  */
-/* $XFree86: xc/programs/Xserver/hw/darwin/darwinKeyboard.h,v 1.1 2003/11/01 08:13:08 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/darwin/darwinKeyboard.c,v 1.18 2003/05/14 05:27:55 torrey Exp $ */
 
 #ifndef DARWIN_KEYBOARD_H
 #define DARWIN_KEYBOARD_H 1
diff --git a/hw/darwin/iokit/xfIOKit.c b/hw/darwin/iokit/xfIOKit.c
index a7f5f18ee..0c8104e67 100644
--- a/hw/darwin/iokit/xfIOKit.c
+++ b/hw/darwin/iokit/xfIOKit.c
@@ -33,7 +33,8 @@
  * holders shall not be used in advertising or otherwise to promote the sale,
  * use or other dealings in this Software without prior written authorization.
  */
-/* $XFree86: xc/programs/Xserver/hw/darwin/iokit/xfIOKit.c,v 1.3 2003/12/09 04:42:36 torrey Exp $ */
+/* $XdotOrg: xc/programs/Xserver/hw/darwin/iokit/xfIOKit.c,v 1.3 2003/12/09 04:42:36 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/darwin/iokit/xfIOKit.c,v 1.2 2003/10/16 23:50:09 torrey Exp $ */
 
 #include "X.h"
 #include "Xproto.h"
diff --git a/hw/darwin/iokit/xfIOKit.h b/hw/darwin/iokit/xfIOKit.h
index 413dfd7e8..1e03cdf80 100644
--- a/hw/darwin/iokit/xfIOKit.h
+++ b/hw/darwin/iokit/xfIOKit.h
@@ -28,7 +28,7 @@
  * holders shall not be used in advertising or otherwise to promote the sale,
  * use or other dealings in this Software without prior written authorization.
  */
-/* $XFree86: xc/programs/Xserver/hw/darwin/iokit/xfIOKit.h,v 1.1 2003/05/14 05:27:56 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/darwin/xfIOKit.h,v 1.10 2003/03/15 18:02:08 torrey Exp $ */
 
 #ifndef _XFIOKIT_H
 #define _XFIOKIT_H
diff --git a/hw/darwin/iokit/xfIOKitCursor.c b/hw/darwin/iokit/xfIOKitCursor.c
index f3c80145f..69eb41d2f 100644
--- a/hw/darwin/iokit/xfIOKitCursor.c
+++ b/hw/darwin/iokit/xfIOKitCursor.c
@@ -57,7 +57,7 @@
  * holders shall not be used in advertising or otherwise to promote the sale,
  * use or other dealings in this Software without prior written authorization.
  */
-/* $XFree86: xc/programs/Xserver/hw/darwin/iokit/xfIOKitCursor.c,v 1.1 2003/05/14 05:27:56 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/darwin/xfIOKitCursor.c,v 1.6 2002/12/10 00:00:39 torrey Exp $ */
 
 #include "scrnintstr.h"
 #include "cursorstr.h"
diff --git a/hw/darwin/iokit/xfIOKitStartup.c b/hw/darwin/iokit/xfIOKitStartup.c
index 9d25c69fe..80508775e 100644
--- a/hw/darwin/iokit/xfIOKitStartup.c
+++ b/hw/darwin/iokit/xfIOKitStartup.c
@@ -28,7 +28,7 @@
  * holders shall not be used in advertising or otherwise to promote the sale,
  * use or other dealings in this Software without prior written authorization.
  */
-/* $XFree86: xc/programs/Xserver/hw/darwin/iokit/xfIOKitStartup.c,v 1.2 2003/11/01 08:13:08 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/darwin/iokit/xfIOKitStartup.c,v 1.1 2003/05/14 05:27:56 torrey Exp $ */
 
 #include "darwin.h"
 #include "darwinKeyboard.h"
diff --git a/hw/darwin/quartz/Preferences.h b/hw/darwin/quartz/Preferences.h
index 22a2f1441..feecf24d6 100644
--- a/hw/darwin/quartz/Preferences.h
+++ b/hw/darwin/quartz/Preferences.h
@@ -25,7 +25,7 @@
  * sale, use or other dealings in this Software without prior written
  * authorization.
  */
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/Preferences.h,v 1.3 2003/09/16 00:36:12 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/Preferences.h,v 1.2 2003/01/15 02:34:05 torrey Exp $ */
 
 #import <Cocoa/Cocoa.h>
 
diff --git a/hw/darwin/quartz/Preferences.m b/hw/darwin/quartz/Preferences.m
index 4120b6360..cca2f695d 100644
--- a/hw/darwin/quartz/Preferences.m
+++ b/hw/darwin/quartz/Preferences.m
@@ -30,7 +30,7 @@
  * sale, use or other dealings in this Software without prior written
  * authorization.
  */
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/Preferences.m,v 1.4 2003/09/16 00:36:12 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/Preferences.m,v 1.3 2003/05/14 05:27:56 torrey Exp $ */
 
 #import "quartzCommon.h"
 
diff --git a/hw/darwin/quartz/XApplication.h b/hw/darwin/quartz/XApplication.h
index 3d3e96dab..a2622e060 100644
--- a/hw/darwin/quartz/XApplication.h
+++ b/hw/darwin/quartz/XApplication.h
@@ -30,7 +30,7 @@
  * sale, use or other dealings in this Software without prior written
  * authorization.
  */
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/XApplication.h,v 1.2 2002/10/12 00:32:45 torrey Exp $ */
+/* $XFree86: $ */
 
 #import <Cocoa/Cocoa.h>
 
diff --git a/hw/darwin/quartz/XApplication.m b/hw/darwin/quartz/XApplication.m
index 9b81bbee0..e0ee8d9c6 100644
--- a/hw/darwin/quartz/XApplication.m
+++ b/hw/darwin/quartz/XApplication.m
@@ -30,7 +30,7 @@
  * sale, use or other dealings in this Software without prior written
  * authorization.
  */
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/XApplication.m,v 1.2 2002/10/12 00:32:45 torrey Exp $ */
+/* $XFree86: $ */
 
 #import "XApplication.h"
 
diff --git a/hw/darwin/quartz/XDarwin.pbproj/project.pbxproj b/hw/darwin/quartz/XDarwin.pbproj/project.pbxproj
index 54b1d7180..9dc2bb92c 100644
--- a/hw/darwin/quartz/XDarwin.pbproj/project.pbxproj
+++ b/hw/darwin/quartz/XDarwin.pbproj/project.pbxproj
@@ -334,7 +334,7 @@
 	<key>CFBundleExecutable</key>
 	<string>XDarwin</string>
 	<key>CFBundleGetInfoString</key>
-	<string>XDarwin 1.3.0, ©2001-2003 XFree86 Project, Inc.</string>
+	<string>XDarwin 1.3.0, X.Org Foundation</string>
 	<key>CFBundleIconFile</key>
 	<string>XDarwin.icns</string>
 	<key>CFBundleIdentifier</key>
diff --git a/hw/darwin/quartz/XDarwinStartup.c b/hw/darwin/quartz/XDarwinStartup.c
index 7b2c89f38..0adb4c212 100644
--- a/hw/darwin/quartz/XDarwinStartup.c
+++ b/hw/darwin/quartz/XDarwinStartup.c
@@ -38,7 +38,7 @@
  * dealings in this Software without prior written authorization from
  * Torrey T. Lyons.
  */
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/XDarwinStartup.c,v 1.2 2003/05/14 05:15:56 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/XDarwinStartup.c,v 1.1 2002/03/28 02:21:18 torrey Exp $ */
 
 #include <unistd.h>
 #include <stdio.h>
diff --git a/hw/darwin/quartz/XDarwinStartup.man b/hw/darwin/quartz/XDarwinStartup.man
index 312f4b88b..28efd1edf 100644
--- a/hw/darwin/quartz/XDarwinStartup.man
+++ b/hw/darwin/quartz/XDarwinStartup.man
@@ -1,4 +1,4 @@
-.\" $XFree86: xc/programs/Xserver/hw/darwin/quartz/XDarwinStartup.man,v 1.1 2002/03/28 02:21:18 torrey Exp $
+.\" $XFree86: xc/programs/Xserver/hw/darwin/bundle/XDarwinStartup.man,v 1.1 2002/02/05 19:16:14 torrey Exp $
 .TH XDarwinStartup 1
 .SH NAME
 XDarwinStartup - Startup program for the XDarwin X window server
diff --git a/hw/darwin/quartz/XServer.h b/hw/darwin/quartz/XServer.h
index 01b8ec55e..695086bfe 100644
--- a/hw/darwin/quartz/XServer.h
+++ b/hw/darwin/quartz/XServer.h
@@ -29,7 +29,8 @@
  * sale, use or other dealings in this Software without prior written
  * authorization.
  */
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/XServer.h,v 1.17 2003/11/24 05:39:01 torrey Exp $ */
+/* $XdotOrg: xc/programs/Xserver/hw/darwin/quartz/XServer.h,v 1.17 2003/11/24 05:39:01 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/XServer.h,v 1.16 2003/11/23 06:04:01 torrey Exp $ */
 
 #define BOOL xBOOL
 #include "Xproto.h"
diff --git a/hw/darwin/quartz/XServer.m b/hw/darwin/quartz/XServer.m
index 56e672204..3fad95c97 100644
--- a/hw/darwin/quartz/XServer.m
+++ b/hw/darwin/quartz/XServer.m
@@ -34,7 +34,8 @@
  * sale, use or other dealings in this Software without prior written
  * authorization.
  */
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/XServer.m,v 1.20 2003/11/27 01:59:53 torrey Exp $ */
+/* $XdotOrg: xc/programs/Xserver/hw/darwin/quartz/XServer.m,v 1.20 2003/11/27 01:59:53 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/XServer.m,v 1.19 2003/11/24 05:39:01 torrey Exp $ */
 
 #include "quartzCommon.h"
 
diff --git a/hw/darwin/quartz/applewm.c b/hw/darwin/quartz/applewm.c
index d3e302727..9b62915c8 100644
--- a/hw/darwin/quartz/applewm.c
+++ b/hw/darwin/quartz/applewm.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/applewm.c,v 1.3 2003/11/11 23:48:41 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/applewm.c,v 1.2 2003/09/16 00:36:13 torrey Exp $ */
 /**************************************************************************
 
 Copyright (c) 2002 Apple Computer, Inc. All Rights Reserved.
diff --git a/hw/darwin/quartz/applewmExt.h b/hw/darwin/quartz/applewmExt.h
index 650173941..63e2bea9f 100644
--- a/hw/darwin/quartz/applewmExt.h
+++ b/hw/darwin/quartz/applewmExt.h
@@ -27,7 +27,7 @@ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 **************************************************************************/
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/applewmExt.h,v 1.3 2003/11/17 22:20:35 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/applewmExt.h,v 1.2 2003/11/11 23:48:41 torrey Exp $ */
 
 #ifndef _APPLEWMEXT_H_
 #define _APPLEWMEXT_H_
diff --git a/hw/darwin/quartz/cr/XView.h b/hw/darwin/quartz/cr/XView.h
index 666061dc1..01f5b04b4 100644
--- a/hw/darwin/quartz/cr/XView.h
+++ b/hw/darwin/quartz/cr/XView.h
@@ -25,7 +25,7 @@
  * holders shall not be used in advertising or otherwise to promote the sale,
  * use or other dealings in this Software without prior written authorization.
  */
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/cr/XView.h,v 1.1 2003/06/07 05:49:07 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/XView.h,v 1.2 2002/07/15 19:58:31 torrey Exp $ */
 
 #import <Cocoa/Cocoa.h>
 
diff --git a/hw/darwin/quartz/cr/XView.m b/hw/darwin/quartz/cr/XView.m
index 2bf689ede..5feac6b42 100644
--- a/hw/darwin/quartz/cr/XView.m
+++ b/hw/darwin/quartz/cr/XView.m
@@ -29,7 +29,7 @@
  * holders shall not be used in advertising or otherwise to promote the sale,
  * use or other dealings in this Software without prior written authorization.
  */
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/cr/XView.m,v 1.2 2003/10/16 23:50:16 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/cr/XView.m,v 1.1 2003/06/07 05:49:07 torrey Exp $ */
 
 #import "XView.h"
 
diff --git a/hw/darwin/quartz/cr/cr.h b/hw/darwin/quartz/cr/cr.h
index 74752f768..94133e4af 100644
--- a/hw/darwin/quartz/cr/cr.h
+++ b/hw/darwin/quartz/cr/cr.h
@@ -26,7 +26,7 @@
  * holders shall not be used in advertising or otherwise to promote the sale,
  * use or other dealings in this Software without prior written authorization.
  */
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/cr/cr.h,v 1.3 2003/11/03 05:36:31 tsi Exp $ */
+/* $XFree86$ */
 
 #ifndef _CR_H
 #define _CR_H
diff --git a/hw/darwin/quartz/cr/crAppleWM.m b/hw/darwin/quartz/cr/crAppleWM.m
index 66e832b66..a2e97ff81 100644
--- a/hw/darwin/quartz/cr/crAppleWM.m
+++ b/hw/darwin/quartz/cr/crAppleWM.m
@@ -26,7 +26,7 @@
  * holders shall not be used in advertising or otherwise to promote the sale,
  * use or other dealings in this Software without prior written authorization.
  */
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/cr/crAppleWM.m,v 1.1 2003/09/16 00:36:14 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/xprFrame.c,v 1.2 2003/06/30 01:45:13 torrey Exp $ */
 
 #include "quartzCommon.h"
 #include "cr.h"
diff --git a/hw/darwin/quartz/cr/crFrame.m b/hw/darwin/quartz/cr/crFrame.m
index b308dec74..2fade0c80 100644
--- a/hw/darwin/quartz/cr/crFrame.m
+++ b/hw/darwin/quartz/cr/crFrame.m
@@ -27,7 +27,8 @@
  * holders shall not be used in advertising or otherwise to promote the sale,
  * use or other dealings in this Software without prior written authorization.
  */
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/cr/crFrame.m,v 1.8 2003/12/05 07:00:10 torrey Exp $ */
+/* $XdotOrg$ */
+/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/cr/crFrame.m,v 1.9 2004/03/19 02:05:29 torrey Exp $ */
 
 #include "quartzCommon.h"
 #include "cr.h"
@@ -35,6 +36,7 @@
 #undef BOOL
 #define BOOL xBOOL
 #include "rootless.h"
+#include "windowstr.h"
 #undef BOOL
 
 WindowPtr nextWindowToFrame = NULL;
@@ -78,7 +80,12 @@ CRCreateFrame(RootlessWindowPtr pFrame, ScreenPtr pScreen,
     theWindow = [[NSWindow alloc] initWithContentRect:bounds
                                   styleMask:theStyleMask
                                   backing:NSBackingStoreBuffered
+#ifdef DEFER_NSWINDOW
+                                  defer:YES];
+#else
                                   defer:NO];
+#endif
+
     if (!theWindow) return FALSE;
 
     [theWindow setBackgroundColor:[NSColor clearColor]];  // erase transparent
@@ -95,6 +102,21 @@ CRCreateFrame(RootlessWindowPtr pFrame, ScreenPtr pScreen,
     [theWindow setContentView:theView];
     [theWindow setInitialFirstResponder:theView];
 
+#ifdef DEFER_NSWINDOW
+    // We need the NSWindow to actually be created now.
+    // If we had to defer creating it, we have to order it
+    // onto the screen to force it to be created.
+
+    if (pFrame->win->prevSib) {
+        CRWindowPtr crWinPtr = (CRWindowPtr) RootlessFrameForWindow(
+                                                pFrame->win->prevSib, FALSE);
+        int upperNum = [crWinPtr->window windowNumber];
+        [theWindow orderWindow:NSWindowBelow relativeTo:upperNum];
+    } else {
+        [theWindow orderFront:nil];
+    }
+#endif
+
     [theWindow setAcceptsMouseMovedEvents:YES];
 
     crWinPtr->window = theWindow;
diff --git a/hw/darwin/quartz/cr/crScreen.m b/hw/darwin/quartz/cr/crScreen.m
index ab27e8eb8..f0b7db297 100644
--- a/hw/darwin/quartz/cr/crScreen.m
+++ b/hw/darwin/quartz/cr/crScreen.m
@@ -1,3 +1,4 @@
+/* $XdotOrg$ */
 /*
  * Cocoa rootless implementation initialization
  */
@@ -27,7 +28,7 @@
  * holders shall not be used in advertising or otherwise to promote the sale,
  * use or other dealings in this Software without prior written authorization.
  */
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/cr/crScreen.m,v 1.6 2003/11/27 01:59:53 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/cr/crScreen.m,v 1.5 2003/11/12 20:21:52 torrey Exp $ */
 
 #include "quartzCommon.h"
 #include "cr.h"
diff --git a/hw/darwin/quartz/fullscreen/fullscreen.c b/hw/darwin/quartz/fullscreen/fullscreen.c
index 470528943..d0702a082 100644
--- a/hw/darwin/quartz/fullscreen/fullscreen.c
+++ b/hw/darwin/quartz/fullscreen/fullscreen.c
@@ -25,7 +25,8 @@
  * holders shall not be used in advertising or otherwise to promote the sale,
  * use or other dealings in this Software without prior written authorization.
  */
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/fullscreen/fullscreen.c,v 1.4 2003/12/09 04:41:27 torrey Exp $ */
+/* $XdotOrg: xc/programs/Xserver/hw/darwin/quartz/fullscreen/fullscreen.c,v 1.1.4.1 2003/12/06 13:24:23 kaleb Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/fullscreen/fullscreen.c,v 1.3 2003/11/27 01:59:53 torrey Exp $ */
 
 #include "quartzCommon.h"
 #include "darwin.h"
diff --git a/hw/darwin/quartz/fullscreen/quartzCursor.c b/hw/darwin/quartz/fullscreen/quartzCursor.c
index 72ad5ed8e..8abce2318 100644
--- a/hw/darwin/quartz/fullscreen/quartzCursor.c
+++ b/hw/darwin/quartz/fullscreen/quartzCursor.c
@@ -29,7 +29,7 @@
  * holders shall not be used in advertising or otherwise to promote the sale,
  * use or other dealings in this Software without prior written authorization.
  */
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/fullscreen/quartzCursor.c,v 1.1 2003/09/16 00:36:15 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/quartzCursor.c,v 1.5 2003/01/23 00:34:26 torrey Exp $ */
 
 #include "quartzCommon.h"
 #include "quartzCursor.h"
diff --git a/hw/darwin/quartz/fullscreen/quartzCursor.h b/hw/darwin/quartz/fullscreen/quartzCursor.h
index d822c3e86..efcc4435e 100644
--- a/hw/darwin/quartz/fullscreen/quartzCursor.h
+++ b/hw/darwin/quartz/fullscreen/quartzCursor.h
@@ -29,7 +29,7 @@
  * holders shall not be used in advertising or otherwise to promote the sale,
  * use or other dealings in this Software without prior written authorization.
  */
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/fullscreen/quartzCursor.h,v 1.1 2003/09/16 00:36:15 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/quartzCursor.h,v 1.1 2002/03/28 02:21:19 torrey Exp $ */
 
 #ifndef QUARTZCURSOR_H
 #define QUARTZCURSOR_H
diff --git a/hw/darwin/quartz/keysym2ucs.c b/hw/darwin/quartz/keysym2ucs.c
index 420830965..98b8b6fee 100644
--- a/hw/darwin/quartz/keysym2ucs.c
+++ b/hw/darwin/quartz/keysym2ucs.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/keysym2ucs.c,v 1.1 2003/11/01 08:13:08 torrey Exp $
+/* $XFree86: $
  *
  * This module converts keysym values into the corresponding ISO 10646
  * (UCS, Unicode) values.
diff --git a/hw/darwin/quartz/keysym2ucs.h b/hw/darwin/quartz/keysym2ucs.h
index 1d9183448..c7ff6f3b3 100644
--- a/hw/darwin/quartz/keysym2ucs.h
+++ b/hw/darwin/quartz/keysym2ucs.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/keysym2ucs.h,v 1.1 2003/11/01 08:13:08 torrey Exp $
+/* $XFree86: $
  *
  * This module converts keysym values into the corresponding ISO 10646
  * (UCS, Unicode) values.
diff --git a/hw/darwin/quartz/pseudoramiX.c b/hw/darwin/quartz/pseudoramiX.c
index 2dd7c3ae5..dad735e1d 100644
--- a/hw/darwin/quartz/pseudoramiX.c
+++ b/hw/darwin/quartz/pseudoramiX.c
@@ -32,7 +32,7 @@ shall not be used in advertising or otherwise to promote the sale, use or other
 dealings in this Software without prior written authorization from Digital
 Equipment Corporation.
 ******************************************************************/
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/pseudoramiX.c,v 1.3 2003/04/30 23:15:39 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/pseudoramiX.c,v 1.2 2002/10/16 21:13:33 dawes Exp $ */
 
 #include "pseudoramiX.h"
 
diff --git a/hw/darwin/quartz/pseudoramiX.h b/hw/darwin/quartz/pseudoramiX.h
index 23738cfb3..3dcae622a 100644
--- a/hw/darwin/quartz/pseudoramiX.h
+++ b/hw/darwin/quartz/pseudoramiX.h
@@ -1,7 +1,7 @@
 /*
  * Minimal implementation of PanoramiX/Xinerama
  */
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/pseudoramiX.h,v 1.2 2003/04/30 23:15:39 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/pseudoramiX.h,v 1.1 2002/03/28 02:21:18 torrey Exp $ */
 
 extern int noPseudoramiXExtension;
 
diff --git a/hw/darwin/quartz/quartz.c b/hw/darwin/quartz/quartz.c
index 91ca9fa28..093b88a10 100644
--- a/hw/darwin/quartz/quartz.c
+++ b/hw/darwin/quartz/quartz.c
@@ -1,3 +1,4 @@
+/* $XdotOrg$ */
 /**************************************************************
  *
  * Quartz-specific support for the Darwin X Server
@@ -29,7 +30,7 @@
  * holders shall not be used in advertising or otherwise to promote the sale,
  * use or other dealings in this Software without prior written authorization.
  */
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/quartz.c,v 1.14 2003/11/24 05:39:02 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/quartz.c,v 1.13 2003/11/12 20:21:51 torrey Exp $ */
 
 #include "quartzCommon.h"
 #include "quartz.h"
diff --git a/hw/darwin/quartz/quartz.h b/hw/darwin/quartz/quartz.h
index 2cec61d66..18f88d1f8 100644
--- a/hw/darwin/quartz/quartz.h
+++ b/hw/darwin/quartz/quartz.h
@@ -30,7 +30,8 @@
  * holders shall not be used in advertising or otherwise to promote the sale,
  * use or other dealings in this Software without prior written authorization.
  */
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/quartz.h,v 1.8 2003/11/27 01:59:53 torrey Exp $ */
+/* $XdotOrg: xc/programs/Xserver/hw/darwin/quartz/quartz.h,v 1.8 2003/11/27 01:59:53 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/quartz.h,v 1.7 2003/11/12 20:21:51 torrey Exp $ */
 
 #ifndef _QUARTZ_H
 #define _QUARTZ_H
diff --git a/hw/darwin/quartz/quartzAudio.c b/hw/darwin/quartz/quartzAudio.c
index a3e6af127..64a4f33cc 100644
--- a/hw/darwin/quartz/quartzAudio.c
+++ b/hw/darwin/quartz/quartzAudio.c
@@ -35,7 +35,7 @@
  * holders shall not be used in advertising or otherwise to promote the sale,
  * use or other dealings in this Software without prior written authorization.
  */
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/quartzAudio.c,v 1.2 2003/05/14 05:27:56 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/quartzAudio.c,v 1.1 2002/03/28 02:21:18 torrey Exp $ */
 
 #include "quartzCommon.h"
 #include "quartzAudio.h"
diff --git a/hw/darwin/quartz/quartzAudio.h b/hw/darwin/quartz/quartzAudio.h
index 1d213e36a..e20c21ad2 100644
--- a/hw/darwin/quartz/quartzAudio.h
+++ b/hw/darwin/quartz/quartzAudio.h
@@ -28,7 +28,7 @@
  * holders shall not be used in advertising or otherwise to promote the sale,
  * use or other dealings in this Software without prior written authorization.
  */
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/quartzAudio.h,v 1.1 2002/03/28 02:21:19 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/darwin/bundle/quartzAudio.h,v 1.2 2001/04/01 20:45:43 tsi Exp $ */
 
 #ifndef _QUARTZAUDIO_H
 #define _QUARTZAUDIO_H
diff --git a/hw/darwin/quartz/quartzCocoa.m b/hw/darwin/quartz/quartzCocoa.m
index bba71c041..0c671890f 100644
--- a/hw/darwin/quartz/quartzCocoa.m
+++ b/hw/darwin/quartz/quartzCocoa.m
@@ -1,3 +1,4 @@
+/* $XdotOrg$ */
 /**************************************************************
  *
  * Quartz-specific support for the Darwin X Server
@@ -33,7 +34,7 @@
  * holders shall not be used in advertising or otherwise to promote the sale,
  * use or other dealings in this Software without prior written authorization.
  */
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/quartzCocoa.m,v 1.4 2003/05/14 05:27:56 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/quartzCocoa.m,v 1.3 2003/01/19 06:52:54 torrey Exp $ */
 
 #include "quartzCommon.h"
 
diff --git a/hw/darwin/quartz/quartzCommon.h b/hw/darwin/quartz/quartzCommon.h
index e3ae4b850..16f654a5d 100644
--- a/hw/darwin/quartz/quartzCommon.h
+++ b/hw/darwin/quartz/quartzCommon.h
@@ -1,3 +1,4 @@
+/* $XdotOrg$ */
 /*
  * quartzCommon.h
  *
@@ -31,7 +32,7 @@
  * holders shall not be used in advertising or otherwise to promote the sale,
  * use or other dealings in this Software without prior written authorization.
  */
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/quartzCommon.h,v 1.14 2003/11/12 20:21:51 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/quartzCommon.h,v 1.13 2003/10/16 23:50:10 torrey Exp $ */
 
 #ifndef _QUARTZCOMMON_H
 #define _QUARTZCOMMON_H
diff --git a/hw/darwin/quartz/quartzCursor.c b/hw/darwin/quartz/quartzCursor.c
index 8abce2318..711ce64f0 100644
--- a/hw/darwin/quartz/quartzCursor.c
+++ b/hw/darwin/quartz/quartzCursor.c
@@ -29,7 +29,7 @@
  * holders shall not be used in advertising or otherwise to promote the sale,
  * use or other dealings in this Software without prior written authorization.
  */
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/quartzCursor.c,v 1.5 2003/01/23 00:34:26 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/quartzCursor.c,v 1.4 2002/11/19 23:01:30 torrey Exp $ */
 
 #include "quartzCommon.h"
 #include "quartzCursor.h"
diff --git a/hw/darwin/quartz/quartzCursor.h b/hw/darwin/quartz/quartzCursor.h
index 9710d4be2..4db5531fa 100644
--- a/hw/darwin/quartz/quartzCursor.h
+++ b/hw/darwin/quartz/quartzCursor.h
@@ -29,7 +29,7 @@
  * holders shall not be used in advertising or otherwise to promote the sale,
  * use or other dealings in this Software without prior written authorization.
  */
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/quartzCursor.h,v 1.1 2002/03/28 02:21:19 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/darwin/bundle/quartzCursor.h,v 1.2 2001/09/23 04:04:49 torrey Exp $ */
 
 #ifndef QUARTZCURSOR_H
 #define QUARTZCURSOR_H
diff --git a/hw/darwin/quartz/quartzKeyboard.c b/hw/darwin/quartz/quartzKeyboard.c
index eab86e27e..d6a79b578 100644
--- a/hw/darwin/quartz/quartzKeyboard.c
+++ b/hw/darwin/quartz/quartzKeyboard.c
@@ -32,7 +32,7 @@
    promote the sale, use or other dealings in this Software without
    prior written authorization.
 */
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/quartzKeyboard.c,v 1.2 2004/01/19 01:22:47 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/quartzKeyboard.c,v 1.1 2003/11/01 08:13:08 torrey Exp $ */
 
 #include "quartzCommon.h"
 
@@ -69,9 +69,11 @@ const static struct {
     {57,  XK_Caps_Lock},
     {58,  XK_Alt_L},
     {59,  XK_Control_L},
+
     {60,  XK_Shift_R},
     {61,  XK_Alt_R},
     {62,  XK_Control_R},
+    {63,  XK_Meta_R},
 
     {122, XK_F1},
     {120, XK_F2},
diff --git a/hw/darwin/quartz/quartzPasteboard.c b/hw/darwin/quartz/quartzPasteboard.c
index 658832aa1..e9f9d6698 100644
--- a/hw/darwin/quartz/quartzPasteboard.c
+++ b/hw/darwin/quartz/quartzPasteboard.c
@@ -29,7 +29,7 @@
  * holders shall not be used in advertising or otherwise to promote the sale,
  * use or other dealings in this Software without prior written authorization.
  */
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/quartzPasteboard.c,v 1.1 2002/03/28 02:21:19 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/darwin/bundle/quartzPasteboard.c,v 1.3 2001/09/23 04:04:49 torrey Exp $ */
 
 #include "quartzPasteboard.h"
 
diff --git a/hw/darwin/quartz/quartzPasteboard.h b/hw/darwin/quartz/quartzPasteboard.h
index fef375493..296c52c17 100644
--- a/hw/darwin/quartz/quartzPasteboard.h
+++ b/hw/darwin/quartz/quartzPasteboard.h
@@ -29,7 +29,7 @@
  * holders shall not be used in advertising or otherwise to promote the sale,
  * use or other dealings in this Software without prior written authorization.
  */
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/quartzPasteboard.h,v 1.1 2002/03/28 02:21:19 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/darwin/bundle/quartzPasteboard.h,v 1.1 2001/03/15 22:24:27 torrey Exp $ */
 
 #ifndef _QUARTZPASTEBOARD_H
 #define _QUARTZPASTEBOARD_H
diff --git a/hw/darwin/quartz/quartzStartup.c b/hw/darwin/quartz/quartzStartup.c
index bb7c7d214..5a11d5321 100644
--- a/hw/darwin/quartz/quartzStartup.c
+++ b/hw/darwin/quartz/quartzStartup.c
@@ -28,7 +28,7 @@
  * holders shall not be used in advertising or otherwise to promote the sale,
  * use or other dealings in this Software without prior written authorization.
  */
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/quartzStartup.c,v 1.9 2003/11/15 00:07:09 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/quartzStartup.c,v 1.8 2003/11/05 00:15:00 torrey Exp $ */
 
 #include <fcntl.h>
 #include <unistd.h>
diff --git a/hw/darwin/quartz/xpr/Xplugin.h b/hw/darwin/quartz/xpr/Xplugin.h
index 8985f7b11..e2e97b4c8 100644
--- a/hw/darwin/quartz/xpr/Xplugin.h
+++ b/hw/darwin/quartz/xpr/Xplugin.h
@@ -30,7 +30,7 @@
 
    Note that these interfaces are provided solely for the use of the
    X11 server. Any other uses are unsupported and strongly discouraged. */
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/Xplugin.h,v 1.3 2003/06/27 20:21:42 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/Xplugin.h,v 1.2 2003/05/02 00:08:49 torrey Exp $ */
 
 #ifndef XPLUGIN_H
 #define XPLUGIN_H 1
diff --git a/hw/darwin/quartz/xpr/appledri.c b/hw/darwin/quartz/xpr/appledri.c
index 3062d964a..0eba61cb2 100644
--- a/hw/darwin/quartz/xpr/appledri.c
+++ b/hw/darwin/quartz/xpr/appledri.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/appledri.c,v 1.1 2003/06/30 01:45:13 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/GL/dri/xf86dri.c,v 1.10 2000/12/07 20:26:14 dawes Exp $ */
 /**************************************************************************
 
 Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
diff --git a/hw/darwin/quartz/xpr/dri.c b/hw/darwin/quartz/xpr/dri.c
index aa595af85..17f9e91a0 100644
--- a/hw/darwin/quartz/xpr/dri.c
+++ b/hw/darwin/quartz/xpr/dri.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/dri.c,v 1.1 2003/06/30 01:45:13 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/GL/dri/dri.c,v 1.34 2001/12/10 19:07:19 dawes Exp $ */
 /**************************************************************************
 
 Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
diff --git a/hw/darwin/quartz/xpr/dri.h b/hw/darwin/quartz/xpr/dri.h
index 350f61b56..5d0b1fec8 100644
--- a/hw/darwin/quartz/xpr/dri.h
+++ b/hw/darwin/quartz/xpr/dri.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/dri.h,v 1.1 2003/06/30 01:45:13 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/GL/dri/dri.h,v 1.18 2001/03/21 16:21:40 dawes Exp $ */
 /**************************************************************************
 
 Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
diff --git a/hw/darwin/quartz/xpr/dristruct.h b/hw/darwin/quartz/xpr/dristruct.h
index 1a2949b18..ae1b99db5 100644
--- a/hw/darwin/quartz/xpr/dristruct.h
+++ b/hw/darwin/quartz/xpr/dristruct.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/dristruct.h,v 1.1 2003/06/30 01:45:13 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/GL/dri/dristruct.h,v 1.10 2001/03/21 16:21:40 dawes Exp $ */
 /**************************************************************************
 
 Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
diff --git a/hw/darwin/quartz/xpr/x-hash.c b/hw/darwin/quartz/xpr/x-hash.c
index ad36204c5..632ffdb33 100644
--- a/hw/darwin/quartz/xpr/x-hash.c
+++ b/hw/darwin/quartz/xpr/x-hash.c
@@ -27,7 +27,7 @@
    copyright holders shall not be used in advertising or otherwise to
    promote the sale, use or other dealings in this Software without
    prior written authorization. */
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/x-hash.c,v 1.2 2003/06/30 01:45:13 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/x-hash.c,v 1.1 2003/04/30 23:15:42 torrey Exp $ */
 
 #include "x-hash.h"
 #include "x-list.h"
diff --git a/hw/darwin/quartz/xpr/x-hash.h b/hw/darwin/quartz/xpr/x-hash.h
index 2abb08cd7..97d4cc40c 100644
--- a/hw/darwin/quartz/xpr/x-hash.h
+++ b/hw/darwin/quartz/xpr/x-hash.h
@@ -27,7 +27,7 @@
    copyright holders shall not be used in advertising or otherwise to
    promote the sale, use or other dealings in this Software without
    prior written authorization. */
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/x-hash.h,v 1.2 2003/06/30 01:45:13 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/x-hash.h,v 1.1 2003/04/30 23:15:42 torrey Exp $ */
 
 #ifndef X_HASH_H
 #define X_HASH_H 1
diff --git a/hw/darwin/quartz/xpr/x-hook.c b/hw/darwin/quartz/xpr/x-hook.c
index 3414e1543..dcd34fdc5 100644
--- a/hw/darwin/quartz/xpr/x-hook.c
+++ b/hw/darwin/quartz/xpr/x-hook.c
@@ -27,7 +27,7 @@
    copyright holders shall not be used in advertising or otherwise to
    promote the sale, use or other dealings in this Software without
    prior written authorization. */
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/x-hook.c,v 1.1 2003/06/30 01:45:13 torrey Exp $ */
+/* $XFree86: $ */
 
 #include "x-hook.h"
 #include <stdlib.h>
diff --git a/hw/darwin/quartz/xpr/x-hook.h b/hw/darwin/quartz/xpr/x-hook.h
index 14e8ca1f5..0b5e038fe 100644
--- a/hw/darwin/quartz/xpr/x-hook.h
+++ b/hw/darwin/quartz/xpr/x-hook.h
@@ -27,7 +27,7 @@
    copyright holders shall not be used in advertising or otherwise to
    promote the sale, use or other dealings in this Software without
    prior written authorization. */
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/x-hook.h,v 1.1 2003/06/30 01:45:13 torrey Exp $ */
+/* $XFree86: $ */
 
 #ifndef X_HOOK_H
 #define X_HOOK_H 1
diff --git a/hw/darwin/quartz/xpr/x-list.c b/hw/darwin/quartz/xpr/x-list.c
index 859a5163d..17843362a 100644
--- a/hw/darwin/quartz/xpr/x-list.c
+++ b/hw/darwin/quartz/xpr/x-list.c
@@ -27,7 +27,7 @@
    copyright holders shall not be used in advertising or otherwise to
    promote the sale, use or other dealings in this Software without
    prior written authorization. */
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/x-list.c,v 1.2 2003/06/30 01:45:13 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/x-list.c,v 1.1 2003/04/30 23:15:42 torrey Exp $ */
 
 #include "x-list.h"
 #include <stdlib.h>
diff --git a/hw/darwin/quartz/xpr/x-list.h b/hw/darwin/quartz/xpr/x-list.h
index a65cfcb7c..991e2b1f6 100644
--- a/hw/darwin/quartz/xpr/x-list.h
+++ b/hw/darwin/quartz/xpr/x-list.h
@@ -27,7 +27,7 @@
    copyright holders shall not be used in advertising or otherwise to
    promote the sale, use or other dealings in this Software without
    prior written authorization. */
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/x-list.h,v 1.2 2003/06/30 01:45:13 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/x-list.h,v 1.1 2003/04/30 23:15:42 torrey Exp $ */
 
 #ifndef X_LIST_H
 #define X_LIST_H 1
diff --git a/hw/darwin/quartz/xpr/xpr.h b/hw/darwin/quartz/xpr/xpr.h
index b3091f8e1..d82aef62b 100644
--- a/hw/darwin/quartz/xpr/xpr.h
+++ b/hw/darwin/quartz/xpr/xpr.h
@@ -26,7 +26,8 @@
  * holders shall not be used in advertising or otherwise to promote the sale,
  * use or other dealings in this Software without prior written authorization.
  */
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/xpr.h,v 1.5 2003/11/27 01:59:53 torrey Exp $ */
+/* $XdotOrg: xc/programs/Xserver/hw/darwin/quartz/xpr/xpr.h,v 1.5 2003/11/27 01:59:53 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/xpr.h,v 1.4 2003/11/12 20:21:52 torrey Exp $ */
 
 #ifndef XPR_H
 #define XPR_H
diff --git a/hw/darwin/quartz/xpr/xprAppleWM.c b/hw/darwin/quartz/xpr/xprAppleWM.c
index eca0de334..a5186d5f6 100644
--- a/hw/darwin/quartz/xpr/xprAppleWM.c
+++ b/hw/darwin/quartz/xpr/xprAppleWM.c
@@ -27,7 +27,7 @@
  * holders shall not be used in advertising or otherwise to promote the sale,
  * use or other dealings in this Software without prior written authorization.
  */
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/xprAppleWM.c,v 1.1 2003/09/16 00:36:15 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/xprFrame.c,v 1.2 2003/06/30 01:45:13 torrey Exp $ */
 
 #include "xpr.h"
 #include "applewmExt.h"
diff --git a/hw/darwin/quartz/xpr/xprCursor.c b/hw/darwin/quartz/xpr/xprCursor.c
index a3dea69e2..ee06043df 100644
--- a/hw/darwin/quartz/xpr/xprCursor.c
+++ b/hw/darwin/quartz/xpr/xprCursor.c
@@ -30,7 +30,7 @@
  * holders shall not be used in advertising or otherwise to promote the sale,
  * use or other dealings in this Software without prior written authorization.
  */
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/xprCursor.c,v 1.2 2003/09/16 00:36:15 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/xprCursor.c,v 1.1 2003/04/30 23:15:42 torrey Exp $ */
 
 #include "quartzCommon.h"
 #include "xpr.h"
diff --git a/hw/darwin/quartz/xpr/xprFrame.c b/hw/darwin/quartz/xpr/xprFrame.c
index 552153852..15a52a52c 100644
--- a/hw/darwin/quartz/xpr/xprFrame.c
+++ b/hw/darwin/quartz/xpr/xprFrame.c
@@ -27,7 +27,8 @@
  * holders shall not be used in advertising or otherwise to promote the sale,
  * use or other dealings in this Software without prior written authorization.
  */
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/xprFrame.c,v 1.5 2003/11/27 01:59:53 torrey Exp $ */
+/* $XdotOrg: xc/programs/Xserver/hw/darwin/quartz/xpr/xprFrame.c,v 1.5 2003/11/27 01:59:53 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/xprFrame.c,v 1.4 2003/11/12 20:21:52 torrey Exp $ */
 
 #include "xpr.h"
 #include "rootlessCommon.h"
diff --git a/hw/darwin/quartz/xpr/xprScreen.c b/hw/darwin/quartz/xpr/xprScreen.c
index 771b7c9f4..e1d3cf972 100644
--- a/hw/darwin/quartz/xpr/xprScreen.c
+++ b/hw/darwin/quartz/xpr/xprScreen.c
@@ -1,3 +1,4 @@
+/* $XdotOrg$ */
 /*
  * Xplugin rootless implementation screen functions
  */
@@ -27,7 +28,7 @@
  * holders shall not be used in advertising or otherwise to promote the sale,
  * use or other dealings in this Software without prior written authorization.
  */
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/xprScreen.c,v 1.9 2003/11/27 01:59:53 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/xprScreen.c,v 1.8 2003/11/12 20:21:52 torrey Exp $ */
 
 #include "quartzCommon.h"
 #include "quartz.h"
diff --git a/hw/darwin/utils/README.txt b/hw/darwin/utils/README.txt
index 94d61b1f0..fb6d4399e 100644
--- a/hw/darwin/utils/README.txt
+++ b/hw/darwin/utils/README.txt
@@ -108,4 +108,4 @@ of the NeXT .keymapping file.
 
 
 
-$XFree86: xc/programs/Xserver/hw/darwin/utils/README.txt,v 1.2 2000/12/05 21:18:34 dawes Exp $
+$XFree86: xc/programs/Xserver/hw/darwin/utils/README.txt,v 1.1 2000/12/01 19:47:39 dawes Exp $
diff --git a/hw/darwin/utils/dumpkeymap.c b/hw/darwin/utils/dumpkeymap.c
index a264cbc10..8f3340b15 100644
--- a/hw/darwin/utils/dumpkeymap.c
+++ b/hw/darwin/utils/dumpkeymap.c
@@ -1,4 +1,4 @@
-// $XFree86: xc/programs/Xserver/hw/darwin/utils/dumpkeymap.c,v 1.4 2003/04/13 14:52:51 herrb Exp $
+// $XFree86: dumpkeymap.c,v 1.3 2000/12/05 21:18:34 dawes Exp $
 //=============================================================================
 //
 // Copyright (C) 1999,2000 by Eric Sunshine <sunshine@sunshineco.com>
diff --git a/hw/darwin/utils/dumpkeymap.man b/hw/darwin/utils/dumpkeymap.man
index 2ad6d54d2..12983bada 100644
--- a/hw/darwin/utils/dumpkeymap.man
+++ b/hw/darwin/utils/dumpkeymap.man
@@ -30,7 +30,7 @@
 //
 //=============================================================================
 //
-// $XFree86: xc/programs/Xserver/hw/darwin/utils/dumpkeymap.man,v 1.2 2000/12/05 21:18:34 dawes Exp $
+// $XFree86$
 //
 ..
 .ig
author	Egbert Eich <eich@suse.de>	2004-04-23 19:54:30 +0000
committer	Egbert Eich <eich@suse.de>	2004-04-23 19:54:30 +0000
commit	2fb588620030ad393f8500d60e16144d59e4effe (patch)
tree	07262cbe15a40e5aeae54f62751260f83243ab79 /hw/darwin
parent	0664db19bf37f9dd69cca6adff4e238e310c3092 (diff)