[SCM] live-manual branch, debian, updated. debian/3.0_a1-1-7-ge527b03
José Luis Zabalza
jlz.3008 at gmail.com
Fri Feb 18 05:32:04 UTC 2011
The following commit has been merged in the debian branch:
commit e527b038d6b223977d575691b8faaaec5a6f296a
Merge: c0ff3061438394f3a353c5e0216d306442ebf739 4bfcb7a90a68683238207c895ac8d82b4c2ee437
Author: José Luis Zabalza <jlz.3008 at gmail.com>
Date: Fri Feb 18 05:30:54 2011 +0000
Translating user_customization-installer.ssi.po to ES
diff --combined manual/de/live-manual.ssm
index 55d08ad,e22734c..2204118
--- a/manual/de/live-manual.ssm
+++ b/manual/de/live-manual.ssm
@@@ -9,7 -9,7 +9,11 @@@
: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:
- :published: 2011-02-17
++<<<<<<< HEAD
+ :published: 2011-02-18
++=======
++ :published: 2011-02-18
++>>>>>>> 4bfcb7a90a68683238207c895ac8d82b4c2ee437
@publisher: Debian Live Project <debian-live at lists.debian.org>
diff --combined manual/en/live-manual.ssm
index ceb3807,3ba6276..fa669c4
--- a/manual/en/live-manual.ssm
+++ b/manual/en/live-manual.ssm
@@@ -9,7 -9,7 +9,11 @@@
: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:
- :published: 2011-02-17
++<<<<<<< HEAD
+ :published: 2011-02-18
++=======
++ :published: 2011-02-18
++>>>>>>> 4bfcb7a90a68683238207c895ac8d82b4c2ee437
@publisher: Debian Live Project <debian-live at lists.debian.org>
diff --combined manual/es/live-manual.ssm
index ceb3807,3ba6276..fa669c4
--- a/manual/es/live-manual.ssm
+++ b/manual/es/live-manual.ssm
@@@ -9,7 -9,7 +9,11 @@@
: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:
- :published: 2011-02-17
++<<<<<<< HEAD
+ :published: 2011-02-18
++=======
++ :published: 2011-02-18
++>>>>>>> 4bfcb7a90a68683238207c895ac8d82b4c2ee437
@publisher: Debian Live Project <debian-live at lists.debian.org>
diff --combined manual/fr/live-manual.ssm
index ceb3807,3ba6276..fa669c4
--- a/manual/fr/live-manual.ssm
+++ b/manual/fr/live-manual.ssm
@@@ -9,7 -9,7 +9,11 @@@
: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:
- :published: 2011-02-17
++<<<<<<< HEAD
+ :published: 2011-02-18
++=======
++ :published: 2011-02-18
++>>>>>>> 4bfcb7a90a68683238207c895ac8d82b4c2ee437
@publisher: Debian Live Project <debian-live at lists.debian.org>
diff --combined manual/it/live-manual.ssm
index eeabc6d,be51d78..a31cdb0
--- a/manual/it/live-manual.ssm
+++ b/manual/it/live-manual.ssm
@@@ -9,7 -9,7 +9,11 @@@
: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:
- :published: 2011-02-17
++<<<<<<< HEAD
+ :published: 2011-02-18
++=======
++ :published: 2011-02-18
++>>>>>>> 4bfcb7a90a68683238207c895ac8d82b4c2ee437
@publisher: Debian Live Project <debian-live at lists.debian.org>
diff --combined manual/po/de/live-manual.ssm.po
index df3dbc1,8269397..7dc6cbb
--- a/manual/po/de/live-manual.ssm.po
+++ b/manual/po/de/live-manual.ssm.po
@@@ -6,7 -6,7 +6,7 @@@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
- "POT-Creation-Date: 2011-02-18 05:09+0000\n"
-"POT-Creation-Date: 2011-02-17 17:32-0400\n"
++"POT-Creation-Date: 2011-02-18 05:17+0000\n"
"PO-Revision-Date: 2010-10-03 20:30+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@@ -41,20 -41,20 +41,30 @@@ msgid "
msgstr ""
#. type: Plain text
--#: en/live-manual.ssm:13
++#: en/live-manual.ssm:14
#, no-wrap
msgid ""
"@date:\n"
-" :published: 2011-02-17\n"
++"<<<<<<< HEAD\n"
+" :published: 2011-02-18\n"
++"=======\n"
msgstr ""
#. type: Plain text
--#: en/live-manual.ssm:15
++#: en/live-manual.ssm:17
++#, no-wrap
++msgid ""
++" :published: 2011-02-18\n"
++">>>>>>> 4bfcb7a90a68683238207c895ac8d82b4c2ee437\n"
++msgstr ""
++
++#. type: Plain text
++#: en/live-manual.ssm:19
msgid "@publisher: Debian Live Project <debian-live at lists.debian.org>"
msgstr ""
#. type: Plain text
--#: en/live-manual.ssm:21
++#: en/live-manual.ssm:25
#, no-wrap
msgid ""
"@make:\n"
@@@ -65,106 -65,106 +75,106 @@@
msgstr ""
#. type: Plain text
--#: en/live-manual.ssm:23
++#: en/live-manual.ssm:27
msgid ":A~ @title"
msgstr ""
#. type: Plain text
--#: en/live-manual.ssm:25
++#: en/live-manual.ssm:29
msgid ":B~ About"
msgstr ""
#. type: Plain text
--#: en/live-manual.ssm:27
++#: en/live-manual.ssm:31
msgid "<< about_manual.ssi"
msgstr ""
#. type: Plain text
--#: en/live-manual.ssm:29
++#: en/live-manual.ssm:33
msgid "<< about_project.ssi"
msgstr ""
#. type: Plain text
--#: en/live-manual.ssm:31
++#: en/live-manual.ssm:35
msgid ":B~ User"
msgstr ""
#. type: Plain text
--#: en/live-manual.ssm:33
++#: en/live-manual.ssm:37
msgid "<< user_installation.ssi"
msgstr ""
#. type: Plain text
--#: en/live-manual.ssm:35
++#: en/live-manual.ssm:39
msgid "<< user_basics.ssi"
msgstr ""
#. type: Plain text
--#: en/live-manual.ssm:37
++#: en/live-manual.ssm:41
msgid "<< user_overview.ssi"
msgstr ""
#. type: Plain text
--#: en/live-manual.ssm:39
++#: en/live-manual.ssm:43
msgid "<< user_managing_a_configuration.ssi"
msgstr ""
#. type: Plain text
--#: en/live-manual.ssm:41
++#: en/live-manual.ssm:45
msgid "<< user_customization-overview.ssi"
msgstr ""
#. type: Plain text
--#: en/live-manual.ssm:43
++#: en/live-manual.ssm:47
msgid "<< user_customization-packages.ssi"
msgstr ""
#. type: Plain text
--#: en/live-manual.ssm:45
++#: en/live-manual.ssm:49
msgid "<< user_customization-contents.ssi"
msgstr ""
#. type: Plain text
--#: en/live-manual.ssm:47
++#: en/live-manual.ssm:51
msgid "<< user_customization-runtime.ssi"
msgstr ""
#. type: Plain text
--#: en/live-manual.ssm:49
++#: en/live-manual.ssm:53
msgid "<< user_customization-binary.ssi"
msgstr ""
#. type: Plain text
--#: en/live-manual.ssm:51
++#: en/live-manual.ssm:55
msgid "<< user_customization-installer.ssi"
msgstr ""
#. type: Plain text
--#: en/live-manual.ssm:53
++#: en/live-manual.ssm:57
msgid ":B~ Project"
msgstr ""
#. type: Plain text
--#: en/live-manual.ssm:55
++#: en/live-manual.ssm:59
msgid "<< project_bugs.ssi"
msgstr ""
#. type: Plain text
--#: en/live-manual.ssm:57
++#: en/live-manual.ssm:61
msgid "<< project_coding-style.ssi"
msgstr ""
#. type: Plain text
--#: en/live-manual.ssm:59
++#: en/live-manual.ssm:63
msgid "<< project_procedures.ssi"
msgstr ""
#. type: Plain text
--#: en/live-manual.ssm:61 en/user_examples.ssi:2
++#: en/live-manual.ssm:65 en/user_examples.ssi:2
msgid ":B~ Examples"
msgstr ""
#. type: Plain text
--#: en/live-manual.ssm:62
++#: en/live-manual.ssm:66
msgid "<< user_examples.ssi"
msgstr ""
diff --combined manual/po/es/live-manual.ssm.po
index 87f2a3e,8a6d962..f1dae8c
--- a/manual/po/es/live-manual.ssm.po
+++ b/manual/po/es/live-manual.ssm.po
@@@ -6,7 -6,7 +6,7 @@@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
- "POT-Creation-Date: 2011-02-18 05:09+0000\n"
-"POT-Creation-Date: 2011-02-17 17:32-0400\n"
++"POT-Creation-Date: 2011-02-18 05:17+0000\n"
"PO-Revision-Date: 2011-02-07 08:26+0100\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@@ -41,20 -41,20 +41,30 @@@ msgid "
msgstr ""
#. type: Plain text
--#: en/live-manual.ssm:13
++#: en/live-manual.ssm:14
#, no-wrap
msgid ""
"@date:\n"
-" :published: 2011-02-17\n"
++"<<<<<<< HEAD\n"
+" :published: 2011-02-18\n"
++"=======\n"
msgstr ""
#. type: Plain text
--#: en/live-manual.ssm:15
++#: en/live-manual.ssm:17
++#, no-wrap
++msgid ""
++" :published: 2011-02-18\n"
++">>>>>>> 4bfcb7a90a68683238207c895ac8d82b4c2ee437\n"
++msgstr ""
++
++#. type: Plain text
++#: en/live-manual.ssm:19
msgid "@publisher: Debian Live Project <debian-live at lists.debian.org>"
msgstr ""
#. type: Plain text
--#: en/live-manual.ssm:21
++#: en/live-manual.ssm:25
#, no-wrap
msgid ""
"@make:\n"
@@@ -65,106 -65,106 +75,106 @@@
msgstr ""
#. type: Plain text
--#: en/live-manual.ssm:23
++#: en/live-manual.ssm:27
msgid ":A~ @title"
msgstr ""
#. type: Plain text
--#: en/live-manual.ssm:25
++#: en/live-manual.ssm:29
msgid ":B~ About"
msgstr ""
#. type: Plain text
--#: en/live-manual.ssm:27
++#: en/live-manual.ssm:31
msgid "<< about_manual.ssi"
msgstr ""
#. type: Plain text
--#: en/live-manual.ssm:29
++#: en/live-manual.ssm:33
msgid "<< about_project.ssi"
msgstr ""
#. type: Plain text
--#: en/live-manual.ssm:31
++#: en/live-manual.ssm:35
msgid ":B~ User"
msgstr ""
#. type: Plain text
--#: en/live-manual.ssm:33
++#: en/live-manual.ssm:37
msgid "<< user_installation.ssi"
msgstr ""
#. type: Plain text
--#: en/live-manual.ssm:35
++#: en/live-manual.ssm:39
msgid "<< user_basics.ssi"
msgstr ""
#. type: Plain text
--#: en/live-manual.ssm:37
++#: en/live-manual.ssm:41
msgid "<< user_overview.ssi"
msgstr ""
#. type: Plain text
--#: en/live-manual.ssm:39
++#: en/live-manual.ssm:43
msgid "<< user_managing_a_configuration.ssi"
msgstr ""
#. type: Plain text
--#: en/live-manual.ssm:41
++#: en/live-manual.ssm:45
msgid "<< user_customization-overview.ssi"
msgstr ""
#. type: Plain text
--#: en/live-manual.ssm:43
++#: en/live-manual.ssm:47
msgid "<< user_customization-packages.ssi"
msgstr ""
#. type: Plain text
--#: en/live-manual.ssm:45
++#: en/live-manual.ssm:49
msgid "<< user_customization-contents.ssi"
msgstr ""
#. type: Plain text
--#: en/live-manual.ssm:47
++#: en/live-manual.ssm:51
msgid "<< user_customization-runtime.ssi"
msgstr ""
#. type: Plain text
--#: en/live-manual.ssm:49
++#: en/live-manual.ssm:53
msgid "<< user_customization-binary.ssi"
msgstr ""
#. type: Plain text
--#: en/live-manual.ssm:51
++#: en/live-manual.ssm:55
msgid "<< user_customization-installer.ssi"
msgstr ""
#. type: Plain text
--#: en/live-manual.ssm:53
++#: en/live-manual.ssm:57
msgid ":B~ Project"
msgstr ""
#. type: Plain text
--#: en/live-manual.ssm:55
++#: en/live-manual.ssm:59
msgid "<< project_bugs.ssi"
msgstr ""
#. type: Plain text
--#: en/live-manual.ssm:57
++#: en/live-manual.ssm:61
msgid "<< project_coding-style.ssi"
msgstr ""
#. type: Plain text
--#: en/live-manual.ssm:59
++#: en/live-manual.ssm:63
msgid "<< project_procedures.ssi"
msgstr ""
#. type: Plain text
--#: en/live-manual.ssm:61 en/user_examples.ssi:2
++#: en/live-manual.ssm:65 en/user_examples.ssi:2
msgid ":B~ Examples"
msgstr ""
#. type: Plain text
--#: en/live-manual.ssm:62
++#: en/live-manual.ssm:66
msgid "<< user_examples.ssi"
msgstr ""
diff --combined manual/po/fr/live-manual.ssm.po
index af6b2d3,60b5667..cce871b
--- a/manual/po/fr/live-manual.ssm.po
+++ b/manual/po/fr/live-manual.ssm.po
@@@ -6,7 -6,7 +6,7 @@@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
- "POT-Creation-Date: 2011-02-18 05:09+0000\n"
-"POT-Creation-Date: 2011-02-17 17:32-0400\n"
++"POT-Creation-Date: 2011-02-18 05:17+0000\n"
"PO-Revision-Date: 2010-10-21 07:06-0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@@ -41,20 -41,20 +41,30 @@@ msgid "
msgstr ""
#. type: Plain text
--#: en/live-manual.ssm:13
++#: en/live-manual.ssm:14
#, no-wrap
msgid ""
"@date:\n"
-" :published: 2011-02-17\n"
++"<<<<<<< HEAD\n"
+" :published: 2011-02-18\n"
++"=======\n"
msgstr ""
#. type: Plain text
--#: en/live-manual.ssm:15
++#: en/live-manual.ssm:17
++#, no-wrap
++msgid ""
++" :published: 2011-02-18\n"
++">>>>>>> 4bfcb7a90a68683238207c895ac8d82b4c2ee437\n"
++msgstr ""
++
++#. type: Plain text
++#: en/live-manual.ssm:19
msgid "@publisher: Debian Live Project <debian-live at lists.debian.org>"
msgstr ""
#. type: Plain text
--#: en/live-manual.ssm:21
++#: en/live-manual.ssm:25
#, no-wrap
msgid ""
"@make:\n"
@@@ -65,106 -65,106 +75,106 @@@
msgstr ""
#. type: Plain text
--#: en/live-manual.ssm:23
++#: en/live-manual.ssm:27
msgid ":A~ @title"
msgstr ""
#. type: Plain text
--#: en/live-manual.ssm:25
++#: en/live-manual.ssm:29
msgid ":B~ About"
msgstr ""
#. type: Plain text
--#: en/live-manual.ssm:27
++#: en/live-manual.ssm:31
msgid "<< about_manual.ssi"
msgstr ""
#. type: Plain text
--#: en/live-manual.ssm:29
++#: en/live-manual.ssm:33
msgid "<< about_project.ssi"
msgstr ""
#. type: Plain text
--#: en/live-manual.ssm:31
++#: en/live-manual.ssm:35
msgid ":B~ User"
msgstr ""
#. type: Plain text
--#: en/live-manual.ssm:33
++#: en/live-manual.ssm:37
msgid "<< user_installation.ssi"
msgstr ""
#. type: Plain text
--#: en/live-manual.ssm:35
++#: en/live-manual.ssm:39
msgid "<< user_basics.ssi"
msgstr ""
#. type: Plain text
--#: en/live-manual.ssm:37
++#: en/live-manual.ssm:41
msgid "<< user_overview.ssi"
msgstr ""
#. type: Plain text
--#: en/live-manual.ssm:39
++#: en/live-manual.ssm:43
msgid "<< user_managing_a_configuration.ssi"
msgstr ""
#. type: Plain text
--#: en/live-manual.ssm:41
++#: en/live-manual.ssm:45
msgid "<< user_customization-overview.ssi"
msgstr ""
#. type: Plain text
--#: en/live-manual.ssm:43
++#: en/live-manual.ssm:47
msgid "<< user_customization-packages.ssi"
msgstr ""
#. type: Plain text
--#: en/live-manual.ssm:45
++#: en/live-manual.ssm:49
msgid "<< user_customization-contents.ssi"
msgstr ""
#. type: Plain text
--#: en/live-manual.ssm:47
++#: en/live-manual.ssm:51
msgid "<< user_customization-runtime.ssi"
msgstr ""
#. type: Plain text
--#: en/live-manual.ssm:49
++#: en/live-manual.ssm:53
msgid "<< user_customization-binary.ssi"
msgstr ""
#. type: Plain text
--#: en/live-manual.ssm:51
++#: en/live-manual.ssm:55
msgid "<< user_customization-installer.ssi"
msgstr ""
#. type: Plain text
--#: en/live-manual.ssm:53
++#: en/live-manual.ssm:57
msgid ":B~ Project"
msgstr ""
#. type: Plain text
--#: en/live-manual.ssm:55
++#: en/live-manual.ssm:59
msgid "<< project_bugs.ssi"
msgstr ""
#. type: Plain text
--#: en/live-manual.ssm:57
++#: en/live-manual.ssm:61
msgid "<< project_coding-style.ssi"
msgstr ""
#. type: Plain text
--#: en/live-manual.ssm:59
++#: en/live-manual.ssm:63
msgid "<< project_procedures.ssi"
msgstr ""
#. type: Plain text
--#: en/live-manual.ssm:61 en/user_examples.ssi:2
++#: en/live-manual.ssm:65 en/user_examples.ssi:2
msgid ":B~ Examples"
msgstr ""
#. type: Plain text
--#: en/live-manual.ssm:62
++#: en/live-manual.ssm:66
msgid "<< user_examples.ssi"
msgstr ""
diff --combined manual/po/it/live-manual.ssm.po
index 8842d34,43045a3..e8a10ef
--- a/manual/po/it/live-manual.ssm.po
+++ b/manual/po/it/live-manual.ssm.po
@@@ -7,7 -7,7 +7,7 @@@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
- "POT-Creation-Date: 2011-02-18 05:09+0000\n"
-"POT-Creation-Date: 2011-02-17 17:32-0400\n"
++"POT-Creation-Date: 2011-02-18 05:17+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"
@@@ -45,20 -45,20 +45,30 @@@ msgstr "
" :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.\n"
#. type: Plain text
--#: en/live-manual.ssm:13
++#: en/live-manual.ssm:14
#, no-wrap
msgid ""
"@date:\n"
-" :published: 2011-02-17\n"
++"<<<<<<< HEAD\n"
+" :published: 2011-02-18\n"
++"=======\n"
msgstr ""
#. type: Plain text
--#: en/live-manual.ssm:15
++#: en/live-manual.ssm:17
++#, no-wrap
++msgid ""
++" :published: 2011-02-18\n"
++">>>>>>> 4bfcb7a90a68683238207c895ac8d82b4c2ee437\n"
++msgstr ""
++
++#. type: Plain text
++#: en/live-manual.ssm:19
msgid "@publisher: Debian Live Project <debian-live at lists.debian.org>"
msgstr "@publisher: Debian Live Project <debian-live at lists.debian.org>"
#. type: Plain text
--#: en/live-manual.ssm:21
++#: en/live-manual.ssm:25
#, no-wrap
msgid ""
"@make:\n"
@@@ -74,106 -74,106 +84,106 @@@ msgstr "
" :skin: skin_debian-live\n"
#. type: Plain text
--#: en/live-manual.ssm:23
++#: en/live-manual.ssm:27
msgid ":A~ @title"
msgstr ":A~ @title"
#. type: Plain text
--#: en/live-manual.ssm:25
++#: en/live-manual.ssm:29
msgid ":B~ About"
msgstr ":B~ A proposito"
#. type: Plain text
--#: en/live-manual.ssm:27
++#: en/live-manual.ssm:31
msgid "<< about_manual.ssi"
msgstr "<< about_manual.ssi"
#. type: Plain text
--#: en/live-manual.ssm:29
++#: en/live-manual.ssm:33
msgid "<< about_project.ssi"
msgstr "<< about_project.ssi"
#. type: Plain text
--#: en/live-manual.ssm:31
++#: en/live-manual.ssm:35
msgid ":B~ User"
msgstr ":B~ Utente"
#. type: Plain text
--#: en/live-manual.ssm:33
++#: en/live-manual.ssm:37
msgid "<< user_installation.ssi"
msgstr "<< user_installation.ssi"
#. type: Plain text
--#: en/live-manual.ssm:35
++#: en/live-manual.ssm:39
msgid "<< user_basics.ssi"
msgstr "<< user_basics.ssi"
#. type: Plain text
--#: en/live-manual.ssm:37
++#: en/live-manual.ssm:41
msgid "<< user_overview.ssi"
msgstr "<< user_overview.ssi"
#. type: Plain text
--#: en/live-manual.ssm:39
++#: en/live-manual.ssm:43
msgid "<< user_managing_a_configuration.ssi"
msgstr "<< user_managing_a_configuration.ssi"
#. type: Plain text
--#: en/live-manual.ssm:41
++#: en/live-manual.ssm:45
msgid "<< user_customization-overview.ssi"
msgstr "<< user_customization-overview.ssi"
#. type: Plain text
--#: en/live-manual.ssm:43
++#: en/live-manual.ssm:47
msgid "<< user_customization-packages.ssi"
msgstr "<< user_customization-packages.ssi"
#. type: Plain text
--#: en/live-manual.ssm:45
++#: en/live-manual.ssm:49
msgid "<< user_customization-contents.ssi"
msgstr "<< user_customization-contents.ssi"
#. type: Plain text
--#: en/live-manual.ssm:47
++#: en/live-manual.ssm:51
msgid "<< user_customization-runtime.ssi"
msgstr "<< user_customization-runtime.ssi"
#. type: Plain text
--#: en/live-manual.ssm:49
++#: en/live-manual.ssm:53
msgid "<< user_customization-binary.ssi"
msgstr "<< user_customization-binary.ssi"
#. type: Plain text
--#: en/live-manual.ssm:51
++#: en/live-manual.ssm:55
msgid "<< user_customization-installer.ssi"
msgstr "<< user_customization-installer.ssi"
#. type: Plain text
--#: en/live-manual.ssm:53
++#: en/live-manual.ssm:57
msgid ":B~ Project"
msgstr ":B~ Progetto"
#. type: Plain text
--#: en/live-manual.ssm:55
++#: en/live-manual.ssm:59
msgid "<< project_bugs.ssi"
msgstr "<< project_bugs.ssi"
#. type: Plain text
--#: en/live-manual.ssm:57
++#: en/live-manual.ssm:61
msgid "<< project_coding-style.ssi"
msgstr "<< project_coding-style.ssi"
#. type: Plain text
--#: en/live-manual.ssm:59
++#: en/live-manual.ssm:63
msgid "<< project_procedures.ssi"
msgstr "<< project_procedures.ssi"
#. type: Plain text
--#: en/live-manual.ssm:61 en/user_examples.ssi:2
++#: en/live-manual.ssm:65 en/user_examples.ssi:2
msgid ":B~ Examples"
msgstr ":B~ Esempi"
#. type: Plain text
--#: en/live-manual.ssm:62
++#: en/live-manual.ssm:66
msgid "<< user_examples.ssi"
msgstr "<< user_examples.ssi"
diff --combined manual/po/pt_BR/live-manual.ssm.po
index 46e9e12,d7a878c..bae563b
--- a/manual/po/pt_BR/live-manual.ssm.po
+++ b/manual/po/pt_BR/live-manual.ssm.po
@@@ -6,7 -6,7 +6,7 @@@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
- "POT-Creation-Date: 2011-02-18 05:09+0000\n"
-"POT-Creation-Date: 2011-02-17 17:32-0400\n"
++"POT-Creation-Date: 2011-02-18 05:17+0000\n"
"PO-Revision-Date: 2010-10-22 07:52-0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@@ -41,20 -41,20 +41,30 @@@ msgid "
msgstr ""
#. type: Plain text
--#: en/live-manual.ssm:13
++#: en/live-manual.ssm:14
#, no-wrap
msgid ""
"@date:\n"
-" :published: 2011-02-17\n"
++"<<<<<<< HEAD\n"
+" :published: 2011-02-18\n"
++"=======\n"
msgstr ""
#. type: Plain text
--#: en/live-manual.ssm:15
++#: en/live-manual.ssm:17
++#, no-wrap
++msgid ""
++" :published: 2011-02-18\n"
++">>>>>>> 4bfcb7a90a68683238207c895ac8d82b4c2ee437\n"
++msgstr ""
++
++#. type: Plain text
++#: en/live-manual.ssm:19
msgid "@publisher: Debian Live Project <debian-live at lists.debian.org>"
msgstr ""
#. type: Plain text
--#: en/live-manual.ssm:21
++#: en/live-manual.ssm:25
#, no-wrap
msgid ""
"@make:\n"
@@@ -65,106 -65,106 +75,106 @@@
msgstr ""
#. type: Plain text
--#: en/live-manual.ssm:23
++#: en/live-manual.ssm:27
msgid ":A~ @title"
msgstr ""
#. type: Plain text
--#: en/live-manual.ssm:25
++#: en/live-manual.ssm:29
msgid ":B~ About"
msgstr ""
#. type: Plain text
--#: en/live-manual.ssm:27
++#: en/live-manual.ssm:31
msgid "<< about_manual.ssi"
msgstr ""
#. type: Plain text
--#: en/live-manual.ssm:29
++#: en/live-manual.ssm:33
msgid "<< about_project.ssi"
msgstr ""
#. type: Plain text
--#: en/live-manual.ssm:31
++#: en/live-manual.ssm:35
msgid ":B~ User"
msgstr ""
#. type: Plain text
--#: en/live-manual.ssm:33
++#: en/live-manual.ssm:37
msgid "<< user_installation.ssi"
msgstr ""
#. type: Plain text
--#: en/live-manual.ssm:35
++#: en/live-manual.ssm:39
msgid "<< user_basics.ssi"
msgstr ""
#. type: Plain text
--#: en/live-manual.ssm:37
++#: en/live-manual.ssm:41
msgid "<< user_overview.ssi"
msgstr ""
#. type: Plain text
--#: en/live-manual.ssm:39
++#: en/live-manual.ssm:43
msgid "<< user_managing_a_configuration.ssi"
msgstr ""
#. type: Plain text
--#: en/live-manual.ssm:41
++#: en/live-manual.ssm:45
msgid "<< user_customization-overview.ssi"
msgstr ""
#. type: Plain text
--#: en/live-manual.ssm:43
++#: en/live-manual.ssm:47
msgid "<< user_customization-packages.ssi"
msgstr ""
#. type: Plain text
--#: en/live-manual.ssm:45
++#: en/live-manual.ssm:49
msgid "<< user_customization-contents.ssi"
msgstr ""
#. type: Plain text
--#: en/live-manual.ssm:47
++#: en/live-manual.ssm:51
msgid "<< user_customization-runtime.ssi"
msgstr ""
#. type: Plain text
--#: en/live-manual.ssm:49
++#: en/live-manual.ssm:53
msgid "<< user_customization-binary.ssi"
msgstr ""
#. type: Plain text
--#: en/live-manual.ssm:51
++#: en/live-manual.ssm:55
msgid "<< user_customization-installer.ssi"
msgstr ""
#. type: Plain text
--#: en/live-manual.ssm:53
++#: en/live-manual.ssm:57
msgid ":B~ Project"
msgstr ""
#. type: Plain text
--#: en/live-manual.ssm:55
++#: en/live-manual.ssm:59
msgid "<< project_bugs.ssi"
msgstr ""
#. type: Plain text
--#: en/live-manual.ssm:57
++#: en/live-manual.ssm:61
msgid "<< project_coding-style.ssi"
msgstr ""
#. type: Plain text
--#: en/live-manual.ssm:59
++#: en/live-manual.ssm:63
msgid "<< project_procedures.ssi"
msgstr ""
#. type: Plain text
--#: en/live-manual.ssm:61 en/user_examples.ssi:2
++#: en/live-manual.ssm:65 en/user_examples.ssi:2
msgid ":B~ Examples"
msgstr ""
#. type: Plain text
--#: en/live-manual.ssm:62
++#: en/live-manual.ssm:66
msgid "<< user_examples.ssi"
msgstr ""
diff --combined manual/po/ro/live-manual.ssm.po
index f9629a8,67be94f..b415e00
--- a/manual/po/ro/live-manual.ssm.po
+++ b/manual/po/ro/live-manual.ssm.po
@@@ -6,7 -6,7 +6,7 @@@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
- "POT-Creation-Date: 2011-02-18 05:09+0000\n"
-"POT-Creation-Date: 2011-02-17 17:32-0400\n"
++"POT-Creation-Date: 2011-02-18 05:17+0000\n"
"PO-Revision-Date: 2010-10-23 00:04+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@@ -42,20 -42,20 +42,30 @@@ msgid "
msgstr ""
#. type: Plain text
--#: en/live-manual.ssm:13
++#: en/live-manual.ssm:14
#, no-wrap
msgid ""
"@date:\n"
-" :published: 2011-02-17\n"
++"<<<<<<< HEAD\n"
+" :published: 2011-02-18\n"
++"=======\n"
msgstr ""
#. type: Plain text
--#: en/live-manual.ssm:15
++#: en/live-manual.ssm:17
++#, no-wrap
++msgid ""
++" :published: 2011-02-18\n"
++">>>>>>> 4bfcb7a90a68683238207c895ac8d82b4c2ee437\n"
++msgstr ""
++
++#. type: Plain text
++#: en/live-manual.ssm:19
msgid "@publisher: Debian Live Project <debian-live at lists.debian.org>"
msgstr ""
#. type: Plain text
--#: en/live-manual.ssm:21
++#: en/live-manual.ssm:25
#, no-wrap
msgid ""
"@make:\n"
@@@ -66,106 -66,106 +76,106 @@@
msgstr ""
#. type: Plain text
--#: en/live-manual.ssm:23
++#: en/live-manual.ssm:27
msgid ":A~ @title"
msgstr ""
#. type: Plain text
--#: en/live-manual.ssm:25
++#: en/live-manual.ssm:29
msgid ":B~ About"
msgstr ""
#. type: Plain text
--#: en/live-manual.ssm:27
++#: en/live-manual.ssm:31
msgid "<< about_manual.ssi"
msgstr ""
#. type: Plain text
--#: en/live-manual.ssm:29
++#: en/live-manual.ssm:33
msgid "<< about_project.ssi"
msgstr ""
#. type: Plain text
--#: en/live-manual.ssm:31
++#: en/live-manual.ssm:35
msgid ":B~ User"
msgstr ""
#. type: Plain text
--#: en/live-manual.ssm:33
++#: en/live-manual.ssm:37
msgid "<< user_installation.ssi"
msgstr ""
#. type: Plain text
--#: en/live-manual.ssm:35
++#: en/live-manual.ssm:39
msgid "<< user_basics.ssi"
msgstr ""
#. type: Plain text
--#: en/live-manual.ssm:37
++#: en/live-manual.ssm:41
msgid "<< user_overview.ssi"
msgstr ""
#. type: Plain text
--#: en/live-manual.ssm:39
++#: en/live-manual.ssm:43
msgid "<< user_managing_a_configuration.ssi"
msgstr ""
#. type: Plain text
--#: en/live-manual.ssm:41
++#: en/live-manual.ssm:45
msgid "<< user_customization-overview.ssi"
msgstr ""
#. type: Plain text
--#: en/live-manual.ssm:43
++#: en/live-manual.ssm:47
msgid "<< user_customization-packages.ssi"
msgstr ""
#. type: Plain text
--#: en/live-manual.ssm:45
++#: en/live-manual.ssm:49
msgid "<< user_customization-contents.ssi"
msgstr ""
#. type: Plain text
--#: en/live-manual.ssm:47
++#: en/live-manual.ssm:51
msgid "<< user_customization-runtime.ssi"
msgstr ""
#. type: Plain text
--#: en/live-manual.ssm:49
++#: en/live-manual.ssm:53
msgid "<< user_customization-binary.ssi"
msgstr ""
#. type: Plain text
--#: en/live-manual.ssm:51
++#: en/live-manual.ssm:55
msgid "<< user_customization-installer.ssi"
msgstr ""
#. type: Plain text
--#: en/live-manual.ssm:53
++#: en/live-manual.ssm:57
msgid ":B~ Project"
msgstr ""
#. type: Plain text
--#: en/live-manual.ssm:55
++#: en/live-manual.ssm:59
msgid "<< project_bugs.ssi"
msgstr ""
#. type: Plain text
--#: en/live-manual.ssm:57
++#: en/live-manual.ssm:61
msgid "<< project_coding-style.ssi"
msgstr ""
#. type: Plain text
--#: en/live-manual.ssm:59
++#: en/live-manual.ssm:63
msgid "<< project_procedures.ssi"
msgstr ""
#. type: Plain text
--#: en/live-manual.ssm:61 en/user_examples.ssi:2
++#: en/live-manual.ssm:65 en/user_examples.ssi:2
msgid ":B~ Examples"
msgstr ""
#. type: Plain text
--#: en/live-manual.ssm:62
++#: en/live-manual.ssm:66
msgid "<< user_examples.ssi"
msgstr ""
diff --combined manual/pot/live-manual.ssm.pot
index 419a54a,b4f99d6..609fa23
--- a/manual/pot/live-manual.ssm.pot
+++ b/manual/pot/live-manual.ssm.pot
@@@ -7,7 -7,7 +7,7 @@@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
- "POT-Creation-Date: 2011-02-18 05:09+0000\n"
-"POT-Creation-Date: 2011-02-17 17:32-0400\n"
++"POT-Creation-Date: 2011-02-18 05:17+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"
@@@ -41,20 -41,20 +41,30 @@@ msgid "
msgstr ""
#. type: Plain text
--#: en/live-manual.ssm:13
++#: en/live-manual.ssm:14
#, no-wrap
msgid ""
"@date:\n"
-" :published: 2011-02-17\n"
++"<<<<<<< HEAD\n"
+" :published: 2011-02-18\n"
++"=======\n"
msgstr ""
#. type: Plain text
--#: en/live-manual.ssm:15
++#: en/live-manual.ssm:17
++#, no-wrap
++msgid ""
++" :published: 2011-02-18\n"
++">>>>>>> 4bfcb7a90a68683238207c895ac8d82b4c2ee437\n"
++msgstr ""
++
++#. type: Plain text
++#: en/live-manual.ssm:19
msgid "@publisher: Debian Live Project <debian-live at lists.debian.org>"
msgstr ""
#. type: Plain text
--#: en/live-manual.ssm:21
++#: en/live-manual.ssm:25
#, no-wrap
msgid ""
"@make:\n"
@@@ -65,106 -65,106 +75,106 @@@
msgstr ""
#. type: Plain text
--#: en/live-manual.ssm:23
++#: en/live-manual.ssm:27
msgid ":A~ @title"
msgstr ""
#. type: Plain text
--#: en/live-manual.ssm:25
++#: en/live-manual.ssm:29
msgid ":B~ About"
msgstr ""
#. type: Plain text
--#: en/live-manual.ssm:27
++#: en/live-manual.ssm:31
msgid "<< about_manual.ssi"
msgstr ""
#. type: Plain text
--#: en/live-manual.ssm:29
++#: en/live-manual.ssm:33
msgid "<< about_project.ssi"
msgstr ""
#. type: Plain text
--#: en/live-manual.ssm:31
++#: en/live-manual.ssm:35
msgid ":B~ User"
msgstr ""
#. type: Plain text
--#: en/live-manual.ssm:33
++#: en/live-manual.ssm:37
msgid "<< user_installation.ssi"
msgstr ""
#. type: Plain text
--#: en/live-manual.ssm:35
++#: en/live-manual.ssm:39
msgid "<< user_basics.ssi"
msgstr ""
#. type: Plain text
--#: en/live-manual.ssm:37
++#: en/live-manual.ssm:41
msgid "<< user_overview.ssi"
msgstr ""
#. type: Plain text
--#: en/live-manual.ssm:39
++#: en/live-manual.ssm:43
msgid "<< user_managing_a_configuration.ssi"
msgstr ""
#. type: Plain text
--#: en/live-manual.ssm:41
++#: en/live-manual.ssm:45
msgid "<< user_customization-overview.ssi"
msgstr ""
#. type: Plain text
--#: en/live-manual.ssm:43
++#: en/live-manual.ssm:47
msgid "<< user_customization-packages.ssi"
msgstr ""
#. type: Plain text
--#: en/live-manual.ssm:45
++#: en/live-manual.ssm:49
msgid "<< user_customization-contents.ssi"
msgstr ""
#. type: Plain text
--#: en/live-manual.ssm:47
++#: en/live-manual.ssm:51
msgid "<< user_customization-runtime.ssi"
msgstr ""
#. type: Plain text
--#: en/live-manual.ssm:49
++#: en/live-manual.ssm:53
msgid "<< user_customization-binary.ssi"
msgstr ""
#. type: Plain text
--#: en/live-manual.ssm:51
++#: en/live-manual.ssm:55
msgid "<< user_customization-installer.ssi"
msgstr ""
#. type: Plain text
--#: en/live-manual.ssm:53
++#: en/live-manual.ssm:57
msgid ":B~ Project"
msgstr ""
#. type: Plain text
--#: en/live-manual.ssm:55
++#: en/live-manual.ssm:59
msgid "<< project_bugs.ssi"
msgstr ""
#. type: Plain text
--#: en/live-manual.ssm:57
++#: en/live-manual.ssm:61
msgid "<< project_coding-style.ssi"
msgstr ""
#. type: Plain text
--#: en/live-manual.ssm:59
++#: en/live-manual.ssm:63
msgid "<< project_procedures.ssi"
msgstr ""
#. type: Plain text
--#: en/live-manual.ssm:61 en/user_examples.ssi:2
++#: en/live-manual.ssm:65 en/user_examples.ssi:2
msgid ":B~ Examples"
msgstr ""
#. type: Plain text
--#: en/live-manual.ssm:62
++#: en/live-manual.ssm:66
msgid "<< user_examples.ssi"
msgstr ""
diff --combined manual/pt_BR/live-manual.ssm
index ceb3807,3ba6276..fa669c4
--- a/manual/pt_BR/live-manual.ssm
+++ b/manual/pt_BR/live-manual.ssm
@@@ -9,7 -9,7 +9,11 @@@
: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:
- :published: 2011-02-17
++<<<<<<< HEAD
+ :published: 2011-02-18
++=======
++ :published: 2011-02-18
++>>>>>>> 4bfcb7a90a68683238207c895ac8d82b4c2ee437
@publisher: Debian Live Project <debian-live at lists.debian.org>
diff --combined manual/ro/live-manual.ssm
index ceb3807,3ba6276..fa669c4
--- a/manual/ro/live-manual.ssm
+++ b/manual/ro/live-manual.ssm
@@@ -9,7 -9,7 +9,11 @@@
: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:
- :published: 2011-02-17
++<<<<<<< HEAD
+ :published: 2011-02-18
++=======
++ :published: 2011-02-18
++>>>>>>> 4bfcb7a90a68683238207c895ac8d82b4c2ee437
@publisher: Debian Live Project <debian-live at lists.debian.org>
--
live-manual
More information about the debian-live-changes
mailing list