Merge remote-tracking branch 'origin/released'

Conflicts:
	fontconfig/.gitignore
	libX11/src/ConvSel.c
	libX11/src/CrGlCur.c
	libX11/src/CrWindow.c
	libX11/src/GetDflt.c
	libX11/src/Window.c
	libX11/src/xlibi18n/XimProto.h
	libX11/src/xlibi18n/lcDynamic.c
	libxcb/src/.gitignore
	libxcb/src/xcb_ext.c
	libxcb/src/xcb_xid.c
	mesalib/src/glsl/.gitignore
	mesalib/src/glsl/glcpp/.gitignore
	mesalib/src/mapi/glapi/gen/glX_API.xml
	mesalib/src/mapi/glapi/glapi_getproc.c
	mesalib/src/mesa/main/.gitignore
	mesalib/src/mesa/main/syncobj.c
	mesalib/src/mesa/program/.gitignore
	xkbcomp/listing.c
	xkbcomp/xkbpath.c
	xorg-server/.gitignore
	xorg-server/Xext/xvmain.c
	xorg-server/dix/dispatch.c
	xorg-server/hw/xwin/glx/winpriv.h
	xorg-server/hw/xwin/winprefsyacc.y
	xorg-server/hw/xwin/winscrinit.c
	xorg-server/xkeyboard-config/rules/bin/ml1_s.sh
	xorg-server/xkeyboard-config/rules/bin/ml1v1_s.sh
	xorg-server/xkeyboard-config/rules/bin/ml1v_s.sh
	xorg-server/xkeyboard-config/rules/bin/ml_s.sh
	xorg-server/xkeyboard-config/rules/bin/mlv_s.sh
	xorg-server/xkeyboard-config/rules/compat/.gitignore

1 files changed, 264 insertions, 264 deletions

diff --git a/xorg-server/xkeyboard-config/po/ChangeLog b/xorg-server/xkeyboard-config/po/ChangeLog
index 254a4768f..34369d6bc 100644
--- a/xorg-server/xkeyboard-config/po/ChangeLog
+++ b/xorg-server/xkeyboard-config/po/ChangeLog
@@ -1,264 +1,264 @@
-2009-01-27  svu
-
-	* *.po: sync with TP
-
-2008-09-30  svu
-
-	* *.po: sync with TP
-
-2008-05-27  svu
-
-	* *.po: sync with TP
-
-2008-01-29  svu
-
-	* *.po: sync with TP
-
-2007-10-02  gettextize  <bug-gnu-gettext@gnu.org>
-
-	* Makefile.in.in: New file, from gettext-0.16.1.
-
-2007-09-25  svu
-
-	* *.po: sync with TP
-
-2007-09-11  Maxim V. Dziumanenko <dziumanenko@gmail.com>
-
-	* uk.po: updated Ukrainian translation, lost and found
-
-2007-09-11  Nilgün Belma Bugüner <nilgun@buguner.name.tr>
-
-	* tr.po: updated Turkish translation, lost and found
-
-2007-09-11  Daniel Nylander <po@danielnylander.se>
-
-	* sv.po: updated Swedish translation, lost and found
-
-2007-09-11  Zdenko Podobný <zdpo@mailbox.sk>
-
-	* sk.po: updated Slovak translation, lost and found
-
-2007-09-11  Simos Xenitellis <simos74@gmx.net>
-
-	* el.po: updated Greek translation, lost and found
-
-2007-09-11  Tino Meinen <a.t.meinen@chello.nl>
-
-	* nl.po: updated Dutch translation, lost and found
-
-2007-03-12  Changwoo Ryu <cwryu@debian.org>
-
-	* ko.po: added Korean translation
-
-2007-02-25  Tommi Vainikainen <Tommi.Vainikainen@iki.fi>
-
-	* fi.po: updated Finnish translation
-
-2007-02-01  Daniel Nylander <po@danielnylander.se>
-
-	* sv.po: updated Swedish translation
-
-2007-01-12  Andriy Rysin <arysin@myrealbox.com>
-
-	* uk.po: updated Ukrainian translation
-
-2006-12-28  Maxim V. Dziumanenko <dziumanenko@gmail.com>
-
-	* uk.po: updated Ukrainian translation
-
-2005-11-28 Nickolay V. Shmyrev <nshmyrev@yandex.ru>
-
-	* ru.po: updated Russian translation
-
-2005-10-17 Matej Urbančič <matej.urban@gmail.com> 
-
-	* sl.po: updated Slovenian translation
-
-2006-10-13  Gabor Kelemen <kelemeng@gnome.hu>
-
-	* hu.po: updated Hungarian translation
-
-2006-10-07  Sergey E Kvyato <kvantos@plotinka.ru>
-
-	* ru.po: updated Russian translation
-
-2006-10-03  Denis Barbier <barbier@linuxfr.org>
-
-	* fr.po: updated French translation
-
-2006-10-03  Nilgün Belma Bugüner <nilgun@buguner.name.tr>
-
-	* tr.po: updated Turkish translation
-
-2006-10-02  Gabor Kelemen <kelemeng@gnome.hu>
-
-	* hu.po: updated Hungarian translation
-
-2006-09-24  Vladimer Sichinava <vlsichinava@gmail.com>
-
-	* ka.po: added Georgian translation
-
-2006-09-24  Denis Barbier <barbier@linuxfr.org>
-
-	* fr.po: updated French translation
-
-2006-09-09  svu
-
-	* ru.po: updated Ukrainian translation
-
-2006-08-31  Andriy Rysin <arysin@myrealbox.com>
-
-	* uk.po: updated Ukrainian translation
-
-2006-06-29  Francisco Javier F. Serrador <serrador@cvs.gnome.org>
-
-	* es.po: updated Spanish translation
-
-2006-04-09  Francisco Javier F. Serrador <serrador@cvs.gnome.org>
-
-	* es.po: added Spanish translation
-
-2006-04-05  Daniel Nylander <po@danielnylander.se>
-
-	* sv.po: updated Swedish translation
-
-2006-04-01  Maxim V. Dziumanenko <mvd@mylinux.com.ua>
-
-	* uk.po: updated Ukrainian translation
-
-2006-03-17  Daniel Nylander <po@danielnylander.se>
-
-	* sv.po: updated Swedish translation
-
-2006-03-12  Gabor Kelemen <kelemeng@gnome.hu>
-
-	* hu.po: updated Hungarian translation
-
-2006-03-09  Denis Barbier <barbier@linuxfr.org>
-
-	* fr.po: updated French translation
-
-2006-03-04  Данило Шеган <danilo@gnome.org> 
-
-	* sr.po: updated Serbian translation
-
-2006-02-27  Luca Ferretti <elle.uca@infinito.it>
-
-	* it.po: updated Italian translation
-
-2006-01-21  Taco Witte <tcwitte@cs.uu.nl>
-
-	* nl.po: updated Dutch translation
-
-2005-12-31  svu
-
-	* ru.po: updated Russian translation
-
-2005-12-31  jeroen-91@home.nl
-
-	* nl.po: updated Dutch translation
-
-2005-12-01  svu
-
-	* ru.po: updated Russian translation
-
-2005-10-13   Denis Barbier <barbier@linuxfr.org>
-
-	* fr.po: updated French translation
-
-2005-10-02  svu
-
-	* ru.po: updated Russian translation
-
-2005-09-30 Matej Urbančič <matej.urban@gmail.com> 
-
-	* sl.po: adding Slovenian translation
-
-2005-09-13  Wei-Lun Chao <chaoweilun@pcmail.com.tw>
-
-	* zh_TW.po: adding Chinise (traditional) translation
-
-2005-09-13  Tommi Vainikainen <Tommi.Vainikainen@iki.fi>
-
-	* fi.po: adding Finnish translation
-
-2005-09-05  Alexander Shopov <ash@contact.bg>
-
-	* bg.po: updated Bulgarian translation
-
-2005-09-04  svu
-
-	* ru.po: updated Russian translation
-
-2005-08-25  Danilo Segan <dsegan@gmx.net>
-
-	* sr.po: updated Serbian translation
-
-2005-08-23  svu
-
-	* ru.po: updated Russian translation
-
-2005-08-17  nilgun@buguner.name.tr
-
-	* tr.po: updated Turkish translation
-
-2005-08-01  svu
-
-	* ru.po: updated Russian translation
-
-2005-07-31  svu
-
-	* ru.po: updated Russian translation
-
-2005-07-24  svu
-
-	* ru.po: updated Russian translation
-
-2005-05-28  teppi8.gmail.com
-
-	* vi.po: new Vietnamese translation
-
-2005-04-09  chris@protactin.co.uk
-
-	* en_GB.po: new British translation
-
-2005-04-06  Steve Murphy <murf@e-tools.com>
-
-	* rw.po: updated Kinyarwanda translation
-
-2005-01-31  Taco Witte <tcwitte@cs.uu.nl>
-
-	* nl.po: updated Dutch translation
-
-2005-01-26  svu
-
-	* ru.po: updated Russian translation
-
-2005-01-24  svu
-
-	* ru.po: updated Russian translation
-
-2005-01-16  svu
-
-	* ru.po: updated Russian translation
-
-2004-12-22  svu
-
-	* ru.po: updated Russian translation
-
-2004-12-21  Simos Xenitellis <simos74@gmx.net>
-
-	* el.po: adding Greek translation
-
-2004-10-26  Elros Cyriatan <cyriatan@fastmail.fm>
-
-	* nl.po: updated Dutch translation
-
-2004-10-26  svu
-
-	* ru.po: updated Russian translation
-
-2004-10-12  svu
-
-	* ru.po: updated Russian translation
-
+2009-01-27  svu

+

+	* *.po: sync with TP

+

+2008-09-30  svu

+

+	* *.po: sync with TP

+

+2008-05-27  svu

+

+	* *.po: sync with TP

+

+2008-01-29  svu

+

+	* *.po: sync with TP

+

+2007-10-02  gettextize  <bug-gnu-gettext@gnu.org>

+

+	* Makefile.in.in: New file, from gettext-0.16.1.

+

+2007-09-25  svu

+

+	* *.po: sync with TP

+

+2007-09-11  Maxim V. Dziumanenko <dziumanenko@gmail.com>

+

+	* uk.po: updated Ukrainian translation, lost and found

+

+2007-09-11  Nilgün Belma Bugüner <nilgun@buguner.name.tr>

+

+	* tr.po: updated Turkish translation, lost and found

+

+2007-09-11  Daniel Nylander <po@danielnylander.se>

+

+	* sv.po: updated Swedish translation, lost and found

+

+2007-09-11  Zdenko Podobný <zdpo@mailbox.sk>

+

+	* sk.po: updated Slovak translation, lost and found

+

+2007-09-11  Simos Xenitellis <simos74@gmx.net>

+

+	* el.po: updated Greek translation, lost and found

+

+2007-09-11  Tino Meinen <a.t.meinen@chello.nl>

+

+	* nl.po: updated Dutch translation, lost and found

+

+2007-03-12  Changwoo Ryu <cwryu@debian.org>

+

+	* ko.po: added Korean translation

+

+2007-02-25  Tommi Vainikainen <Tommi.Vainikainen@iki.fi>

+

+	* fi.po: updated Finnish translation

+

+2007-02-01  Daniel Nylander <po@danielnylander.se>

+

+	* sv.po: updated Swedish translation

+

+2007-01-12  Andriy Rysin <arysin@myrealbox.com>

+

+	* uk.po: updated Ukrainian translation

+

+2006-12-28  Maxim V. Dziumanenko <dziumanenko@gmail.com>

+

+	* uk.po: updated Ukrainian translation

+

+2005-11-28 Nickolay V. Shmyrev <nshmyrev@yandex.ru>

+

+	* ru.po: updated Russian translation

+

+2005-10-17 Matej Urbančič <matej.urban@gmail.com> 

+

+	* sl.po: updated Slovenian translation

+

+2006-10-13  Gabor Kelemen <kelemeng@gnome.hu>

+

+	* hu.po: updated Hungarian translation

+

+2006-10-07  Sergey E Kvyato <kvantos@plotinka.ru>

+

+	* ru.po: updated Russian translation

+

+2006-10-03  Denis Barbier <barbier@linuxfr.org>

+

+	* fr.po: updated French translation

+

+2006-10-03  Nilgün Belma Bugüner <nilgun@buguner.name.tr>

+

+	* tr.po: updated Turkish translation

+

+2006-10-02  Gabor Kelemen <kelemeng@gnome.hu>

+

+	* hu.po: updated Hungarian translation

+

+2006-09-24  Vladimer Sichinava <vlsichinava@gmail.com>

+

+	* ka.po: added Georgian translation

+

+2006-09-24  Denis Barbier <barbier@linuxfr.org>

+

+	* fr.po: updated French translation

+

+2006-09-09  svu

+

+	* ru.po: updated Ukrainian translation

+

+2006-08-31  Andriy Rysin <arysin@myrealbox.com>

+

+	* uk.po: updated Ukrainian translation

+

+2006-06-29  Francisco Javier F. Serrador <serrador@cvs.gnome.org>

+

+	* es.po: updated Spanish translation

+

+2006-04-09  Francisco Javier F. Serrador <serrador@cvs.gnome.org>

+

+	* es.po: added Spanish translation

+

+2006-04-05  Daniel Nylander <po@danielnylander.se>

+

+	* sv.po: updated Swedish translation

+

+2006-04-01  Maxim V. Dziumanenko <mvd@mylinux.com.ua>

+

+	* uk.po: updated Ukrainian translation

+

+2006-03-17  Daniel Nylander <po@danielnylander.se>

+

+	* sv.po: updated Swedish translation

+

+2006-03-12  Gabor Kelemen <kelemeng@gnome.hu>

+

+	* hu.po: updated Hungarian translation

+

+2006-03-09  Denis Barbier <barbier@linuxfr.org>

+

+	* fr.po: updated French translation

+

+2006-03-04  Данило Шеган <danilo@gnome.org> 

+

+	* sr.po: updated Serbian translation

+

+2006-02-27  Luca Ferretti <elle.uca@infinito.it>

+

+	* it.po: updated Italian translation

+

+2006-01-21  Taco Witte <tcwitte@cs.uu.nl>

+

+	* nl.po: updated Dutch translation

+

+2005-12-31  svu

+

+	* ru.po: updated Russian translation

+

+2005-12-31  jeroen-91@home.nl

+

+	* nl.po: updated Dutch translation

+

+2005-12-01  svu

+

+	* ru.po: updated Russian translation

+

+2005-10-13   Denis Barbier <barbier@linuxfr.org>

+

+	* fr.po: updated French translation

+

+2005-10-02  svu

+

+	* ru.po: updated Russian translation

+

+2005-09-30 Matej Urbančič <matej.urban@gmail.com> 

+

+	* sl.po: adding Slovenian translation

+

+2005-09-13  Wei-Lun Chao <chaoweilun@pcmail.com.tw>

+

+	* zh_TW.po: adding Chinise (traditional) translation

+

+2005-09-13  Tommi Vainikainen <Tommi.Vainikainen@iki.fi>

+

+	* fi.po: adding Finnish translation

+

+2005-09-05  Alexander Shopov <ash@contact.bg>

+

+	* bg.po: updated Bulgarian translation

+

+2005-09-04  svu

+

+	* ru.po: updated Russian translation

+

+2005-08-25  Danilo Segan <dsegan@gmx.net>

+

+	* sr.po: updated Serbian translation

+

+2005-08-23  svu

+

+	* ru.po: updated Russian translation

+

+2005-08-17  nilgun@buguner.name.tr

+

+	* tr.po: updated Turkish translation

+

+2005-08-01  svu

+

+	* ru.po: updated Russian translation

+

+2005-07-31  svu

+

+	* ru.po: updated Russian translation

+

+2005-07-24  svu

+

+	* ru.po: updated Russian translation

+

+2005-05-28  teppi8.gmail.com

+

+	* vi.po: new Vietnamese translation

+

+2005-04-09  chris@protactin.co.uk

+

+	* en_GB.po: new British translation

+

+2005-04-06  Steve Murphy <murf@e-tools.com>

+

+	* rw.po: updated Kinyarwanda translation

+

+2005-01-31  Taco Witte <tcwitte@cs.uu.nl>

+

+	* nl.po: updated Dutch translation

+

+2005-01-26  svu

+

+	* ru.po: updated Russian translation

+

+2005-01-24  svu

+

+	* ru.po: updated Russian translation

+

+2005-01-16  svu

+

+	* ru.po: updated Russian translation

+

+2004-12-22  svu

+

+	* ru.po: updated Russian translation

+

+2004-12-21  Simos Xenitellis <simos74@gmx.net>

+

+	* el.po: adding Greek translation

+

+2004-10-26  Elros Cyriatan <cyriatan@fastmail.fm>

+

+	* nl.po: updated Dutch translation

+

+2004-10-26  svu

+

+	* ru.po: updated Russian translation

+

+2004-10-12  svu

+

+	* ru.po: updated Russian translation

+