[SCM] live-manual branch, debian, updated. debian/3.0_a1-1-16-gc87c85d
chals
chals at altorricon.com
Thu Feb 24 17:12:41 UTC 2011
The following commit has been merged in the debian branch:
commit c87c85d188621f3a1551d316e95f8cadee02473d
Merge: 422b4cce72e2d97b817c26042208003e2ab1ea56 1f04fd8c4b79e2d8d398392fd8c0037d17c6214d
Author: chals <chals at altorricon.com>
Date: Thu Feb 24 18:08:15 2011 +0100
Merge branch 'debian' of live.debian.net:/live-manual into debian
Conflicts:
manual/de/live-manual.ssm
manual/en/live-manual.ssm
manual/es/live-manual.ssm
manual/fr/live-manual.ssm
manual/it/live-manual.ssm
manual/po/de/live-manual.ssm.po
manual/po/es/live-manual.ssm.po
manual/po/fr/live-manual.ssm.po
manual/po/it/live-manual.ssm.po
manual/po/pt_BR/live-manual.ssm.po
manual/po/ro/live-manual.ssm.po
manual/pot/live-manual.ssm.pot
manual/pt_BR/live-manual.ssm
manual/ro/live-manual.ssm
diff --combined manual/de/live-manual.ssm
index 241969d,7bdcf5c..01d7665
--- a/manual/de/live-manual.ssm
+++ b/manual/de/live-manual.ssm
@@@ -10,9 -10,9 +10,15 @@@
@date:
<<<<<<< HEAD
++<<<<<<< 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/en/live-manual.ssm
index 63c9927,d791770..da80a25
--- a/manual/en/live-manual.ssm
+++ b/manual/en/live-manual.ssm
@@@ -10,9 -10,9 +10,15 @@@
@date:
<<<<<<< HEAD
++<<<<<<< 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 72ca56a,3662cd8..2dcee30
--- a/manual/es/live-manual.ssm
+++ b/manual/es/live-manual.ssm
@@@ -10,9 -10,9 +10,15 @@@
@date:
<<<<<<< HEAD
++<<<<<<< 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 63c9927,d791770..da80a25
--- a/manual/fr/live-manual.ssm
+++ b/manual/fr/live-manual.ssm
@@@ -10,9 -10,9 +10,15 @@@
@date:
<<<<<<< HEAD
++<<<<<<< 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/it/live-manual.ssm
index be9cd54,cc9254c..f3e9d45
--- a/manual/it/live-manual.ssm
+++ b/manual/it/live-manual.ssm
@@@ -10,9 -10,9 +10,15 @@@
@date:
<<<<<<< HEAD
++<<<<<<< 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 68221a9,b3ad347..145404c
--- a/manual/po/de/live-manual.ssm.po
+++ b/manual/po/de/live-manual.ssm.po
@@@ -6,7 -6,7 +6,11 @@@
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
"PO-Revision-Date: 2010-10-03 20:30+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@@ -46,7 -46,7 +50,11 @@@ msgstr "
msgid ""
"@date:\n"
"<<<<<<< HEAD\n"
++<<<<<<< HEAD
+" :published: 2011-02-24\n"
++=======
+ " :published: 2011-02-21\n"
++>>>>>>> 1f04fd8c4b79e2d8d398392fd8c0037d17c6214d
"=======\n"
msgstr ""
@@@ -54,7 -54,7 +62,11 @@@
#: en/live-manual.ssm:17
#, no-wrap
msgid ""
++<<<<<<< HEAD
+" :published: 2011-02-24\n"
++=======
+ " :published: 2011-02-21\n"
++>>>>>>> 1f04fd8c4b79e2d8d398392fd8c0037d17c6214d
">>>>>>> 4bfcb7a90a68683238207c895ac8d82b4c2ee437\n"
msgstr ""
diff --combined manual/po/es/live-manual.ssm.po
index 72d7390,c30c78e..1fea1be
--- a/manual/po/es/live-manual.ssm.po
+++ b/manual/po/es/live-manual.ssm.po
@@@ -7,8 -7,8 +7,13 @@@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
++<<<<<<< HEAD
+"POT-Creation-Date: 2011-02-24 17:45+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"
@@@ -46,26 -46,34 +51,42 @@@ msgstr "
#. type: Plain text
#: en/live-manual.ssm:14
- #, no-wrap
+ #, 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"
msgstr ""
"@date:\n"
"<<<<<<< HEAD\n"
-" :published: 2011-02-20\n"
+" :published: 2011-02-24\n"
"=======\n"
#. type: Plain text
#: en/live-manual.ssm:17
- #, no-wrap
+ #, 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-20\n"
+" :published: 2011-02-24\n"
">>>>>>> 4bfcb7a90a68683238207c895ac8d82b4c2ee437\n"
#. type: Plain text
diff --combined manual/po/fr/live-manual.ssm.po
index 72e8f34,86baf08..0fdce91
--- a/manual/po/fr/live-manual.ssm.po
+++ b/manual/po/fr/live-manual.ssm.po
@@@ -6,7 -6,7 +6,11 @@@
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
"PO-Revision-Date: 2010-10-21 07:06-0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@@ -46,7 -46,7 +50,11 @@@ msgstr "
msgid ""
"@date:\n"
"<<<<<<< HEAD\n"
++<<<<<<< HEAD
+" :published: 2011-02-24\n"
++=======
+ " :published: 2011-02-21\n"
++>>>>>>> 1f04fd8c4b79e2d8d398392fd8c0037d17c6214d
"=======\n"
msgstr ""
@@@ -54,7 -54,7 +62,11 @@@
#: en/live-manual.ssm:17
#, no-wrap
msgid ""
++<<<<<<< HEAD
+" :published: 2011-02-24\n"
++=======
+ " :published: 2011-02-21\n"
++>>>>>>> 1f04fd8c4b79e2d8d398392fd8c0037d17c6214d
">>>>>>> 4bfcb7a90a68683238207c895ac8d82b4c2ee437\n"
msgstr ""
diff --combined manual/po/it/live-manual.ssm.po
index 6d48bcd,9e213bb..f1eeb21
--- a/manual/po/it/live-manual.ssm.po
+++ b/manual/po/it/live-manual.ssm.po
@@@ -7,7 -7,7 +7,11 @@@
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
"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"
@@@ -50,7 -50,7 +54,11 @@@ msgstr "
msgid ""
"@date:\n"
"<<<<<<< HEAD\n"
++<<<<<<< HEAD
+" :published: 2011-02-24\n"
++=======
+ " :published: 2011-02-21\n"
++>>>>>>> 1f04fd8c4b79e2d8d398392fd8c0037d17c6214d
"=======\n"
msgstr ""
@@@ -58,7 -58,7 +66,11 @@@
#: en/live-manual.ssm:17
#, no-wrap
msgid ""
++<<<<<<< HEAD
+" :published: 2011-02-24\n"
++=======
+ " :published: 2011-02-21\n"
++>>>>>>> 1f04fd8c4b79e2d8d398392fd8c0037d17c6214d
">>>>>>> 4bfcb7a90a68683238207c895ac8d82b4c2ee437\n"
msgstr ""
diff --combined manual/po/pt_BR/live-manual.ssm.po
index 08c0300,e3da8b2..3762e15
--- a/manual/po/pt_BR/live-manual.ssm.po
+++ b/manual/po/pt_BR/live-manual.ssm.po
@@@ -6,7 -6,7 +6,11 @@@
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
"PO-Revision-Date: 2010-10-22 07:52-0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@@ -46,7 -46,7 +50,11 @@@ msgstr "
msgid ""
"@date:\n"
"<<<<<<< HEAD\n"
++<<<<<<< HEAD
+" :published: 2011-02-24\n"
++=======
+ " :published: 2011-02-21\n"
++>>>>>>> 1f04fd8c4b79e2d8d398392fd8c0037d17c6214d
"=======\n"
msgstr ""
@@@ -54,7 -54,7 +62,11 @@@
#: en/live-manual.ssm:17
#, no-wrap
msgid ""
++<<<<<<< HEAD
+" :published: 2011-02-24\n"
++=======
+ " :published: 2011-02-21\n"
++>>>>>>> 1f04fd8c4b79e2d8d398392fd8c0037d17c6214d
">>>>>>> 4bfcb7a90a68683238207c895ac8d82b4c2ee437\n"
msgstr ""
diff --combined manual/po/ro/live-manual.ssm.po
index fe25163,9da5f98..6fbd5ab
--- a/manual/po/ro/live-manual.ssm.po
+++ b/manual/po/ro/live-manual.ssm.po
@@@ -6,7 -6,7 +6,11 @@@
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
"PO-Revision-Date: 2010-10-23 00:04+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@@ -47,7 -47,7 +51,11 @@@ msgstr "
msgid ""
"@date:\n"
"<<<<<<< HEAD\n"
++<<<<<<< HEAD
+" :published: 2011-02-24\n"
++=======
+ " :published: 2011-02-21\n"
++>>>>>>> 1f04fd8c4b79e2d8d398392fd8c0037d17c6214d
"=======\n"
msgstr ""
@@@ -55,7 -55,7 +63,11 @@@
#: en/live-manual.ssm:17
#, no-wrap
msgid ""
++<<<<<<< HEAD
+" :published: 2011-02-24\n"
++=======
+ " :published: 2011-02-21\n"
++>>>>>>> 1f04fd8c4b79e2d8d398392fd8c0037d17c6214d
">>>>>>> 4bfcb7a90a68683238207c895ac8d82b4c2ee437\n"
msgstr ""
diff --combined manual/pot/live-manual.ssm.pot
index 2e680f1,c708bad..3ab823c
--- a/manual/pot/live-manual.ssm.pot
+++ b/manual/pot/live-manual.ssm.pot
@@@ -7,7 -7,7 +7,11 @@@
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
"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"
@@@ -46,7 -46,7 +50,11 @@@ msgstr "
msgid ""
"@date:\n"
"<<<<<<< HEAD\n"
++<<<<<<< HEAD
+" :published: 2011-02-24\n"
++=======
+ " :published: 2011-02-21\n"
++>>>>>>> 1f04fd8c4b79e2d8d398392fd8c0037d17c6214d
"=======\n"
msgstr ""
@@@ -54,7 -54,7 +62,11 @@@
#: en/live-manual.ssm:17
#, no-wrap
msgid ""
++<<<<<<< HEAD
+" :published: 2011-02-24\n"
++=======
+ " :published: 2011-02-21\n"
++>>>>>>> 1f04fd8c4b79e2d8d398392fd8c0037d17c6214d
">>>>>>> 4bfcb7a90a68683238207c895ac8d82b4c2ee437\n"
msgstr ""
diff --combined manual/pt_BR/live-manual.ssm
index 63c9927,d791770..da80a25
--- a/manual/pt_BR/live-manual.ssm
+++ b/manual/pt_BR/live-manual.ssm
@@@ -10,9 -10,9 +10,15 @@@
@date:
<<<<<<< HEAD
++<<<<<<< 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 63c9927,d791770..da80a25
--- a/manual/ro/live-manual.ssm
+++ b/manual/ro/live-manual.ssm
@@@ -10,9 -10,9 +10,15 @@@
@date:
<<<<<<< HEAD
++<<<<<<< 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>
--
live-manual
More information about the debian-live-changes
mailing list