[SCM] live-manual branch, debian, updated. debian/3.0_a1-1-18-g79d31c0
José Luis Zabalza
jlz.3008 at gmail.com
Sun Feb 27 21:49:46 UTC 2011
The following commit has been merged in the debian branch:
commit 79d31c0940d5cbbb4c4829b7534dfab8bbc2c3cc
Merge: 9b439400d98ba529e5df1954ba7454bf7cf99cd4 c87c85d188621f3a1551d316e95f8cadee02473d
Author: José Luis Zabalza <jlz.3008 at gmail.com>
Date: Sun Feb 27 21:48:20 2011 +0000
translating user_customization-packages.ssi.po to ES
diff --combined manual/de/live-manual.ssm
index c6265a6,01d7665..21b88f5
--- a/manual/de/live-manual.ssm
+++ b/manual/de/live-manual.ssm
@@@ -9,11 -9,17 +9,7 @@@
:license: This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.<br><br>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.<br><br>You should have received a copy of the GNU General Public License along with this program. If not, see http://www.gnu.org/licenses/. <br><br>On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL-3 file.
@date:
--<<<<<<< HEAD
-<<<<<<< HEAD
- :published: 2011-02-24
-=======
- :published: 2011-02-24
-=======
- :published: 2011-02-21
-=======
- :published: 2011-02-21
->>>>>>> 1f04fd8c4b79e2d8d398392fd8c0037d17c6214d
->>>>>>> 4bfcb7a90a68683238207c895ac8d82b4c2ee437
+ :published: 2011-02-27
- =======
- :published: 2011-02-27
- >>>>>>> 4bfcb7a90a68683238207c895ac8d82b4c2ee437
@publisher: Debian Live Project <debian-live at lists.debian.org>
diff --combined manual/en/live-manual.ssm
index 1d7adc1,da80a25..b9ea2d7
--- a/manual/en/live-manual.ssm
+++ b/manual/en/live-manual.ssm
@@@ -9,11 -9,17 +9,7 @@@
:license: This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.<br><br>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.<br><br>You should have received a copy of the GNU General Public License along with this program. If not, see http://www.gnu.org/licenses/. <br><br>On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL-3 file.
@date:
--<<<<<<< HEAD
- :published: 2011-02-27
- =======
- :published: 2011-02-27
- >>>>>>> 4bfcb7a90a68683238207c895ac8d82b4c2ee437
-<<<<<<< HEAD
- :published: 2011-02-24
-=======
- :published: 2011-02-24
-=======
+ :published: 2011-02-21
-=======
- :published: 2011-02-21
->>>>>>> 1f04fd8c4b79e2d8d398392fd8c0037d17c6214d
->>>>>>> 4bfcb7a90a68683238207c895ac8d82b4c2ee437
@publisher: Debian Live Project <debian-live at lists.debian.org>
diff --combined manual/es/live-manual.ssm
index 06d97a3,2dcee30..33c65df
--- a/manual/es/live-manual.ssm
+++ b/manual/es/live-manual.ssm
@@@ -9,11 -9,17 +9,7 @@@
:licencia: Este programa es software libre: puede ser redistribuido y / o modificado bajo los términos de la GNU General Public License publicada por la Free Software Foundation, bien de la versión 3 de la Licencia, o (a su elección) cualquier versión posterior. <br><br> Este programa se distribuye con la esperanza de que sea útil, pero SIN NINGUNA GARANTÍA, incluso sin la garantía implícita de COMERCIALIZACIÓN o IDONEIDAD PARA UN PROPÓSITO PARTICULAR. Consulte la GNU General Public License para más detalles. <br><br> Debería haber recibido una copia de la General Public License GNU junto con este programa. Si no, vea http://www.gnu.org/licenses/. <br><br> En los sistemas Debian, el texto completo de la GNU Licencia Pública General se pueden encontrar en / usr/share/common-licenses/GPL-3
@date:
--<<<<<<< HEAD
- :published: 2011-02-27
- =======
- :published: 2011-02-27
- >>>>>>> 4bfcb7a90a68683238207c895ac8d82b4c2ee437
-<<<<<<< HEAD
- :published: 2011-02-24
-=======
- :published: 2011-02-24
-=======
+ :published: 2011-02-21
-=======
- :published: 2011-02-21
->>>>>>> 1f04fd8c4b79e2d8d398392fd8c0037d17c6214d
->>>>>>> 4bfcb7a90a68683238207c895ac8d82b4c2ee437
@publisher: Debian Live Project <debian-live at lists.debian.org>
diff --combined manual/fr/live-manual.ssm
index 1d7adc1,da80a25..f37b5a0
--- a/manual/fr/live-manual.ssm
+++ b/manual/fr/live-manual.ssm
@@@ -10,9 -10,15 +10,21 @@@
@date:
<<<<<<< HEAD
+ <<<<<<< HEAD
+ :published: 2011-02-27
+=======
+ :published: 2011-02-27
++=======
++<<<<<<< HEAD
+ :published: 2011-02-24
+ =======
+ :published: 2011-02-24
+ =======
+ :published: 2011-02-21
+ =======
+ :published: 2011-02-21
+ >>>>>>> 1f04fd8c4b79e2d8d398392fd8c0037d17c6214d
++>>>>>>> c87c85d188621f3a1551d316e95f8cadee02473d
>>>>>>> 4bfcb7a90a68683238207c895ac8d82b4c2ee437
@publisher: Debian Live Project <debian-live at lists.debian.org>
diff --combined manual/it/live-manual.ssm
index 0d42a7c,f3e9d45..7a4c7ea
--- a/manual/it/live-manual.ssm
+++ b/manual/it/live-manual.ssm
@@@ -9,11 -9,17 +9,7 @@@
:license: Questo programma è software libero: è possibile ridistribuirlo e modificarlo secondo i termini della GNU General Public License come pubblicata dalla Free Software Foundation, sia la versione 3 della licenza o (a scelta) una versione successiva.<br><br>Questo programma è distribuito nella speranza che possa essere utile, ma SENZA ALCUNA GARANZIA, nemmeno la garanzia implicita di COMMERCIABILITÀ o IDONEITÀ PER UN PARTICOLARE SCOPO. Vedere la GNU General Public License per ulteriori dettagli.<br><br>Si dovrebbe aver ricevuto una copia della GNU General Public License con questo programma. In caso contrario, vedere http://www.gnu.org/licenses/. <br><br>Sui sistemi Debian, il testo completo della GNU General Public License può essere trovato nel file /usr/share/common-licenses/GPL-3.
@date:
--<<<<<<< HEAD
- :published: 2011-02-27
- =======
- :published: 2011-02-27
- >>>>>>> 4bfcb7a90a68683238207c895ac8d82b4c2ee437
-<<<<<<< HEAD
- :published: 2011-02-24
-=======
- :published: 2011-02-24
-=======
+ :published: 2011-02-21
-=======
- :published: 2011-02-21
->>>>>>> 1f04fd8c4b79e2d8d398392fd8c0037d17c6214d
->>>>>>> 4bfcb7a90a68683238207c895ac8d82b4c2ee437
@publisher: Debian Live Project <debian-live at lists.debian.org>
diff --combined manual/po/de/live-manual.ssm.po
index 242596d,145404c..28fedad
--- a/manual/po/de/live-manual.ssm.po
+++ b/manual/po/de/live-manual.ssm.po
@@@ -6,7 -6,11 +6,7 @@@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-<<<<<<< HEAD
-"POT-Creation-Date: 2011-02-24 17:45+0100\n"
-=======
-"POT-Creation-Date: 2011-02-21 03:47+0100\n"
->>>>>>> 1f04fd8c4b79e2d8d398392fd8c0037d17c6214d
+"POT-Creation-Date: 2011-02-27 21:30+0000\n"
"PO-Revision-Date: 2010-10-03 20:30+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@@ -45,8 -49,12 +45,7 @@@ msgstr "
#, no-wrap
msgid ""
"@date:\n"
--"<<<<<<< HEAD\n"
-<<<<<<< HEAD
-" :published: 2011-02-24\n"
-=======
-" :published: 2011-02-21\n"
->>>>>>> 1f04fd8c4b79e2d8d398392fd8c0037d17c6214d
+" :published: 2011-02-27\n"
"=======\n"
msgstr ""
@@@ -54,8 -62,12 +53,7 @@@
#: en/live-manual.ssm:17
#, no-wrap
msgid ""
-<<<<<<< HEAD
-" :published: 2011-02-24\n"
-=======
-" :published: 2011-02-21\n"
->>>>>>> 1f04fd8c4b79e2d8d398392fd8c0037d17c6214d
-">>>>>>> 4bfcb7a90a68683238207c895ac8d82b4c2ee437\n"
+" :published: 2011-02-27\n"
- ">>>>>>> 4bfcb7a90a68683238207c895ac8d82b4c2ee437\n"
msgstr ""
#. type: Plain text
diff --combined manual/po/es/live-manual.ssm.po
index 7c894bd,1fea1be..c141969
--- a/manual/po/es/live-manual.ssm.po
+++ b/manual/po/es/live-manual.ssm.po
@@@ -7,8 -7,13 +7,8 @@@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-<<<<<<< HEAD
-"POT-Creation-Date: 2011-02-24 17:45+0100\n"
+"POT-Creation-Date: 2011-02-27 21:30+0000\n"
- "PO-Revision-Date: 2011-02-20 16:20+0100\n"
+ "PO-Revision-Date: 2011-02-24 17:46+0100\n"
-=======
-"POT-Creation-Date: 2011-02-21 03:47+0100\n"
-"PO-Revision-Date: 2011-02-20 16:20+0100\n"
->>>>>>> 1f04fd8c4b79e2d8d398392fd8c0037d17c6214d
"Last-Translator: Carlos Zuferri «chals» <chals at altorricon.com>\n"
"Language-Team: Spanish <debian-l10n-spanish at lists.debian.org>\n"
"Language: es\n"
@@@ -47,34 -52,42 +47,15 @@@ msgstr "
#. type: Plain text
#: en/live-manual.ssm:14
#, fuzzy, no-wrap
--#| msgid ""
--#| "@date:\n"
--#| "<<<<<<< HEAD\n"
--#| " :published: 2011-02-20\n"
--#| "=======\n"
msgid ""
"@date:\n"
--"<<<<<<< HEAD\n"
-<<<<<<< HEAD
-" :published: 2011-02-24\n"
-=======
-" :published: 2011-02-21\n"
->>>>>>> 1f04fd8c4b79e2d8d398392fd8c0037d17c6214d
-"=======\n"
+" :published: 2011-02-27\n"
- "=======\n"
msgstr ""
#. type: Plain text
#: en/live-manual.ssm:17
--#, fuzzy, no-wrap
--#| msgid ""
--#| " :published: 2011-02-20\n"
--#| ">>>>>>> 4bfcb7a90a68683238207c895ac8d82b4c2ee437\n"
msgid ""
-<<<<<<< HEAD
-" :published: 2011-02-24\n"
-=======
-" :published: 2011-02-21\n"
->>>>>>> 1f04fd8c4b79e2d8d398392fd8c0037d17c6214d
-">>>>>>> 4bfcb7a90a68683238207c895ac8d82b4c2ee437\n"
-msgstr ""
-" :published: 2011-02-24\n"
-">>>>>>> 4bfcb7a90a68683238207c895ac8d82b4c2ee437\n"
+" :published: 2011-02-27\n"
- ">>>>>>> 4bfcb7a90a68683238207c895ac8d82b4c2ee437\n"
- msgstr ""
- " :published: 2011-02-20\n"
- ">>>>>>> 4bfcb7a90a68683238207c895ac8d82b4c2ee437\n"
#. type: Plain text
#: en/live-manual.ssm:19
diff --combined manual/po/fr/live-manual.ssm.po
index 7557117,0fdce91..5f90c96
--- a/manual/po/fr/live-manual.ssm.po
+++ b/manual/po/fr/live-manual.ssm.po
@@@ -6,7 -6,11 +6,7 @@@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-<<<<<<< HEAD
-"POT-Creation-Date: 2011-02-24 17:45+0100\n"
-=======
-"POT-Creation-Date: 2011-02-21 03:47+0100\n"
->>>>>>> 1f04fd8c4b79e2d8d398392fd8c0037d17c6214d
+"POT-Creation-Date: 2011-02-27 21:30+0000\n"
"PO-Revision-Date: 2010-10-21 07:06-0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@@ -45,8 -49,12 +45,7 @@@ msgstr "
#, no-wrap
msgid ""
"@date:\n"
--"<<<<<<< HEAD\n"
-<<<<<<< HEAD
-" :published: 2011-02-24\n"
-=======
-" :published: 2011-02-21\n"
->>>>>>> 1f04fd8c4b79e2d8d398392fd8c0037d17c6214d
+" :published: 2011-02-27\n"
"=======\n"
msgstr ""
@@@ -54,8 -62,12 +53,7 @@@
#: en/live-manual.ssm:17
#, no-wrap
msgid ""
-<<<<<<< HEAD
-" :published: 2011-02-24\n"
-=======
-" :published: 2011-02-21\n"
->>>>>>> 1f04fd8c4b79e2d8d398392fd8c0037d17c6214d
-">>>>>>> 4bfcb7a90a68683238207c895ac8d82b4c2ee437\n"
+" :published: 2011-02-27\n"
- ">>>>>>> 4bfcb7a90a68683238207c895ac8d82b4c2ee437\n"
msgstr ""
#. type: Plain text
diff --combined manual/po/it/live-manual.ssm.po
index 435ea60,f1eeb21..def8d2c
--- a/manual/po/it/live-manual.ssm.po
+++ b/manual/po/it/live-manual.ssm.po
@@@ -7,7 -7,11 +7,7 @@@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-<<<<<<< HEAD
-"POT-Creation-Date: 2011-02-24 17:45+0100\n"
-=======
-"POT-Creation-Date: 2011-02-21 03:47+0100\n"
->>>>>>> 1f04fd8c4b79e2d8d398392fd8c0037d17c6214d
+"POT-Creation-Date: 2011-02-27 21:30+0000\n"
"PO-Revision-Date: 2011-01-03 16:23+0100\n"
"Last-Translator: Carlo Stemberger <carlo.stemberger at gmail.com>\n"
"Language-Team: Italian <tp at lists.linux.it>\n"
@@@ -49,8 -53,12 +49,7 @@@ msgstr "
#, no-wrap
msgid ""
"@date:\n"
--"<<<<<<< HEAD\n"
-<<<<<<< HEAD
-" :published: 2011-02-24\n"
-=======
-" :published: 2011-02-21\n"
->>>>>>> 1f04fd8c4b79e2d8d398392fd8c0037d17c6214d
+" :published: 2011-02-27\n"
"=======\n"
msgstr ""
@@@ -58,8 -66,12 +57,7 @@@
#: en/live-manual.ssm:17
#, no-wrap
msgid ""
-<<<<<<< HEAD
-" :published: 2011-02-24\n"
-=======
-" :published: 2011-02-21\n"
->>>>>>> 1f04fd8c4b79e2d8d398392fd8c0037d17c6214d
-">>>>>>> 4bfcb7a90a68683238207c895ac8d82b4c2ee437\n"
+" :published: 2011-02-27\n"
- ">>>>>>> 4bfcb7a90a68683238207c895ac8d82b4c2ee437\n"
msgstr ""
#. type: Plain text
diff --combined manual/po/pt_BR/live-manual.ssm.po
index 1687063,3762e15..d6e106e
--- a/manual/po/pt_BR/live-manual.ssm.po
+++ b/manual/po/pt_BR/live-manual.ssm.po
@@@ -6,7 -6,11 +6,7 @@@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-<<<<<<< HEAD
-"POT-Creation-Date: 2011-02-24 17:45+0100\n"
-=======
-"POT-Creation-Date: 2011-02-21 03:47+0100\n"
->>>>>>> 1f04fd8c4b79e2d8d398392fd8c0037d17c6214d
+"POT-Creation-Date: 2011-02-27 21:30+0000\n"
"PO-Revision-Date: 2010-10-22 07:52-0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@@ -45,8 -49,12 +45,7 @@@ msgstr "
#, no-wrap
msgid ""
"@date:\n"
--"<<<<<<< HEAD\n"
-<<<<<<< HEAD
-" :published: 2011-02-24\n"
-=======
-" :published: 2011-02-21\n"
->>>>>>> 1f04fd8c4b79e2d8d398392fd8c0037d17c6214d
+" :published: 2011-02-27\n"
"=======\n"
msgstr ""
@@@ -54,8 -62,12 +53,7 @@@
#: en/live-manual.ssm:17
#, no-wrap
msgid ""
-<<<<<<< HEAD
-" :published: 2011-02-24\n"
-=======
-" :published: 2011-02-21\n"
->>>>>>> 1f04fd8c4b79e2d8d398392fd8c0037d17c6214d
-">>>>>>> 4bfcb7a90a68683238207c895ac8d82b4c2ee437\n"
+" :published: 2011-02-27\n"
- ">>>>>>> 4bfcb7a90a68683238207c895ac8d82b4c2ee437\n"
msgstr ""
#. type: Plain text
diff --combined manual/po/ro/live-manual.ssm.po
index 5360258,6fbd5ab..38328eb
--- a/manual/po/ro/live-manual.ssm.po
+++ b/manual/po/ro/live-manual.ssm.po
@@@ -6,7 -6,11 +6,7 @@@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-<<<<<<< HEAD
-"POT-Creation-Date: 2011-02-24 17:45+0100\n"
-=======
-"POT-Creation-Date: 2011-02-21 03:47+0100\n"
->>>>>>> 1f04fd8c4b79e2d8d398392fd8c0037d17c6214d
+"POT-Creation-Date: 2011-02-27 21:30+0000\n"
"PO-Revision-Date: 2010-10-23 00:04+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@@ -46,8 -50,12 +46,7 @@@ msgstr "
#, no-wrap
msgid ""
"@date:\n"
--"<<<<<<< HEAD\n"
-<<<<<<< HEAD
-" :published: 2011-02-24\n"
-=======
-" :published: 2011-02-21\n"
->>>>>>> 1f04fd8c4b79e2d8d398392fd8c0037d17c6214d
+" :published: 2011-02-27\n"
"=======\n"
msgstr ""
@@@ -55,8 -63,12 +54,7 @@@
#: en/live-manual.ssm:17
#, no-wrap
msgid ""
-<<<<<<< HEAD
-" :published: 2011-02-24\n"
-=======
-" :published: 2011-02-21\n"
->>>>>>> 1f04fd8c4b79e2d8d398392fd8c0037d17c6214d
-">>>>>>> 4bfcb7a90a68683238207c895ac8d82b4c2ee437\n"
+" :published: 2011-02-27\n"
- ">>>>>>> 4bfcb7a90a68683238207c895ac8d82b4c2ee437\n"
msgstr ""
#. type: Plain text
diff --combined manual/pot/live-manual.ssm.pot
index ca94cd1,3ab823c..42d8122
--- a/manual/pot/live-manual.ssm.pot
+++ b/manual/pot/live-manual.ssm.pot
@@@ -7,7 -7,11 +7,7 @@@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-<<<<<<< HEAD
-"POT-Creation-Date: 2011-02-24 17:45+0100\n"
-=======
-"POT-Creation-Date: 2011-02-21 03:47+0100\n"
->>>>>>> 1f04fd8c4b79e2d8d398392fd8c0037d17c6214d
+"POT-Creation-Date: 2011-02-27 21:30+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@@ -45,8 -49,12 +45,7 @@@ msgstr "
#, no-wrap
msgid ""
"@date:\n"
--"<<<<<<< HEAD\n"
-<<<<<<< HEAD
-" :published: 2011-02-24\n"
-=======
-" :published: 2011-02-21\n"
->>>>>>> 1f04fd8c4b79e2d8d398392fd8c0037d17c6214d
+" :published: 2011-02-27\n"
"=======\n"
msgstr ""
@@@ -54,8 -62,12 +53,7 @@@
#: en/live-manual.ssm:17
#, no-wrap
msgid ""
-<<<<<<< HEAD
-" :published: 2011-02-24\n"
-=======
-" :published: 2011-02-21\n"
->>>>>>> 1f04fd8c4b79e2d8d398392fd8c0037d17c6214d
-">>>>>>> 4bfcb7a90a68683238207c895ac8d82b4c2ee437\n"
+" :published: 2011-02-27\n"
- ">>>>>>> 4bfcb7a90a68683238207c895ac8d82b4c2ee437\n"
msgstr ""
#. type: Plain text
diff --combined manual/pt_BR/live-manual.ssm
index 1d7adc1,da80a25..b9ea2d7
--- a/manual/pt_BR/live-manual.ssm
+++ b/manual/pt_BR/live-manual.ssm
@@@ -9,11 -9,17 +9,7 @@@
:license: This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.<br><br>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.<br><br>You should have received a copy of the GNU General Public License along with this program. If not, see http://www.gnu.org/licenses/. <br><br>On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL-3 file.
@date:
--<<<<<<< HEAD
- :published: 2011-02-27
- =======
- :published: 2011-02-27
- >>>>>>> 4bfcb7a90a68683238207c895ac8d82b4c2ee437
-<<<<<<< HEAD
- :published: 2011-02-24
-=======
- :published: 2011-02-24
-=======
+ :published: 2011-02-21
-=======
- :published: 2011-02-21
->>>>>>> 1f04fd8c4b79e2d8d398392fd8c0037d17c6214d
->>>>>>> 4bfcb7a90a68683238207c895ac8d82b4c2ee437
@publisher: Debian Live Project <debian-live at lists.debian.org>
diff --combined manual/ro/live-manual.ssm
index 1d7adc1,da80a25..c2db325
--- a/manual/ro/live-manual.ssm
+++ b/manual/ro/live-manual.ssm
@@@ -9,11 -9,17 +9,7 @@@
:license: This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.<br><br>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.<br><br>You should have received a copy of the GNU General Public License along with this program. If not, see http://www.gnu.org/licenses/. <br><br>On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL-3 file.
@date:
--<<<<<<< HEAD
-<<<<<<< HEAD
- :published: 2011-02-24
-=======
- :published: 2011-02-24
-=======
- :published: 2011-02-21
-=======
- :published: 2011-02-21
->>>>>>> 1f04fd8c4b79e2d8d398392fd8c0037d17c6214d
->>>>>>> 4bfcb7a90a68683238207c895ac8d82b4c2ee437
+ :published: 2011-02-27
- =======
- :published: 2011-02-27
- >>>>>>> 4bfcb7a90a68683238207c895ac8d82b4c2ee437
@publisher: Debian Live Project <debian-live at lists.debian.org>
--
live-manual
More information about the debian-live-changes
mailing list