X Strike Force X.Org X11 SVN commit: r590 - in branches/6.9/debian: . po
Author: dnusinow
Date: 2005-09-03 13:58:54 -0500 (Sat, 03 Sep 2005)
New Revision: 590
Modified:
branches/6.9/debian/changelog
branches/6.9/debian/po/da.po
branches/6.9/debian/po/fr.po
branches/6.9/debian/po/pt.po
branches/6.9/debian/po/pt_BR.po
branches/6.9/debian/po/vi.po
Log:
Merge changes between -r586 and HEAD -r589
Modified: branches/6.9/debian/changelog
===================================================================
--- branches/6.9/debian/changelog 2005-09-03 18:54:05 UTC (rev 589)
+++ branches/6.9/debian/changelog 2005-09-03 18:58:54 UTC (rev 590)
@@ -77,7 +77,7 @@
-- David Nusinow <dnusinow@debian.org> Sat, 3 Sep 2005 14:33:55 -0400
-xorg-x11 (6.8.2.dfsg.1-6+SVN) unstable; urgency=low
+xorg-x11 (6.8.2.dfsg.1-6+SVN) UNRELEASED; urgency=low
[ Branden Robinson ]
* Add patch #000k: Fix VSW5 (and therefore LSB 3.0) test failures by
@@ -97,7 +97,7 @@
dpkg-buildpackage -nc to work. Thanks Jeremy Shaw.
+ Also add -f to ln command in genscripts to allow -nc to work
- -- Branden Robinson <branden@debian.org> Sat, 3 Sep 2005 13:33:12 -0500
+ -- David Nusinow <dnusinow@debian.org> Sat, 3 Sep 2005 14:52:46 -0400
xorg-x11 (6.8.2.dfsg.1-6) unstable; urgency=low
Modified: branches/6.9/debian/po/da.po
===================================================================
--- branches/6.9/debian/po/da.po 2005-09-03 18:54:05 UTC (rev 589)
+++ branches/6.9/debian/po/da.po 2005-09-03 18:58:54 UTC (rev 590)
@@ -6,6 +6,8 @@
# Copyrights:
# Branden Robinson, 2000-2004
# Dennis Haney, 2002
+# Morten Brix Pedersen <morten@wtf.dk>, 2003.
+# Claus Hindsgaul <claus_h@image.dk>, 2004, 2005.
#
# This file is distributed under the same license as the xorg-x11 package.
# Please see debian/copyright.
@@ -21,8 +23,6 @@
# or http://www.debian.org/intl/l10n/po-debconf/README-trans
#
# Developers do not need to manually edit POT or PO files.
-# Morten Brix Pedersen <morten@wtf.dk>, 2003.
-# Claus Hindsgaul <claus_h@image.dk>, 2004, 2005.
#
msgid ""
msgstr ""
Modified: branches/6.9/debian/po/fr.po
===================================================================
--- branches/6.9/debian/po/fr.po 2005-09-03 18:54:05 UTC (rev 589)
+++ branches/6.9/debian/po/fr.po 2005-09-03 18:58:54 UTC (rev 590)
@@ -1,4 +1,3 @@
-# translation of fr.po to French
# debconf templates for xorg-x11 package
# French translation
#
Modified: branches/6.9/debian/po/pt.po
===================================================================
--- branches/6.9/debian/po/pt.po 2005-09-03 18:54:05 UTC (rev 589)
+++ branches/6.9/debian/po/pt.po 2005-09-03 18:58:54 UTC (rev 590)
@@ -1,6 +1,27 @@
-# Portuguese Translation of xserver-xorg
-# 2005, Eduardo Silva <jobezone@yahoo.com>
-#
+# debconf templates for xorg-x11 package
+# Portuguese translation
+#
+# $Id$
+#
+# Copyright:
+# Branden Robinson, 2000-2004
+# Eduardo Silva <jobezone@yahoo.com>, 2005
+#
+# This file is distributed under the same license as the xorg-x11 package.
+# Please see debian/copyright.
+#
+# Translators, if you are not familiar with the PO format, gettext
+# documentation is worth reading, especially sections dedicated to
+# this format, e.g. by running:
+# info -n '(gettext)PO Files'
+# info -n '(gettext)Header Entry'
+#
+# Some information specific to po-debconf is available at
+# /usr/share/doc/po-debconf/README-trans
+# or http://www.debian.org/intl/l10n/po-debconf/README-trans
+#
+# Developers do not need to manually edit POT or PO files.
+#
msgid ""
msgstr ""
"Project-Id-Version: xserver-xorg_debian_po\n"
Property changes on: branches/6.9/debian/po/pt.po
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: branches/6.9/debian/po/pt_BR.po
===================================================================
--- branches/6.9/debian/po/pt_BR.po 2005-09-03 18:54:05 UTC (rev 589)
+++ branches/6.9/debian/po/pt_BR.po 2005-09-03 18:58:54 UTC (rev 590)
@@ -1,5 +1,5 @@
# debconf templates for xorg-x11 package
-# Brazilian Portuguese translation
+# Portuguese (Brazil) translation
#
# $Id$
#
Modified: branches/6.9/debian/po/vi.po
===================================================================
--- branches/6.9/debian/po/vi.po 2005-09-03 18:54:05 UTC (rev 589)
+++ branches/6.9/debian/po/vi.po 2005-09-03 18:58:54 UTC (rev 590)
@@ -1,9 +1,27 @@
-# Vietnamese translation for xorg-x11.
-# Copyrights Branden Robinson, 2000-2004
+# debconf templates for xorg-x11 package
+# Vietnamese translation
+#
+# $Id$
+#
+# Copyright:
+# Branden Robinson, 2000-2004
+# Clytie Siddall <clytie@riverland.net.au>, 2005.
+#
# This file is distributed under the same license as the xorg-x11 package.
# Please see debian/copyright.
-# Clytie Siddall <clytie@riverland.net.au>, 2005.
#
+# Translators, if you are not familiar with the PO format, gettext
+# documentation is worth reading, especially sections dedicated to
+# this format, e.g. by running:
+# info -n '(gettext)PO Files'
+# info -n '(gettext)Header Entry'
+#
+# Some information specific to po-debconf is available at
+# /usr/share/doc/po-debconf/README-trans
+# or http://www.debian.org/intl/l10n/po-debconf/README-trans
+#
+# Developers do not need to manually edit POT or PO files.
+#
msgid ""
msgstr ""
"Project-Id-Version: 4.3.0.dfsg.1-7+SVN\n"
Reply to: