[SCM] live-manual branch, debian, updated. debian/2.0_a5-1-12-gc6c9801
Daniel Baumann
daniel at debian.org
Tue Sep 7 17:10:43 UTC 2010
The following commit has been merged in the debian branch:
commit c6c98013d554149082a442599b0d6cd83d3aa4f9
Author: Daniel Baumann <daniel at debian.org>
Date: Tue Sep 7 19:07:38 2010 +0200
Adding mandatory spaces for include lines, otherwise sisu skips them.
diff --git a/manual/de/live-manual.ssm b/manual/de/live-manual.ssm
index bcbbf8c..0f27d51 100644
--- a/manual/de/live-manual.ssm
+++ b/manual/de/live-manual.ssm
@@ -29,7 +29,11 @@
:B~ User ~#
-<< user_installation.ssi << user_basics.ssi << user_overview.ssi
+<< user_installation.ssi
+
+<< user_basics.ssi
+
+<< user_overview.ssi
:B~ Development ~#
diff --git a/manual/en/live-manual.ssm b/manual/en/live-manual.ssm
index 8178bd1..0f27d51 100644
--- a/manual/en/live-manual.ssm
+++ b/manual/en/live-manual.ssm
@@ -30,7 +30,9 @@
:B~ User ~#
<< user_installation.ssi
+
<< user_basics.ssi
+
<< user_overview.ssi
:B~ Development ~#
diff --git a/manual/po/de/live-manual.ssm.po b/manual/po/de/live-manual.ssm.po
index a21a255..b3706ec 100644
--- a/manual/po/de/live-manual.ssm.po
+++ b/manual/po/de/live-manual.ssm.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-09-07 15:15+0300\n"
+"POT-Creation-Date: 2010-09-07 19:07+0300\n"
"PO-Revision-Date: 2010-08-14 21:32+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -90,116 +90,126 @@ msgid ":B~ User ~#"
msgstr ""
#. type: Plain text
+#: en/live-manual.ssm:33
+msgid "<< user_installation.ssi"
+msgstr ""
+
+#. type: Plain text
#: en/live-manual.ssm:35
-msgid "<< user_installation.ssi << user_basics.ssi << user_overview.ssi"
+msgid "<< user_basics.ssi"
msgstr ""
#. type: Plain text
#: en/live-manual.ssm:37
-msgid ":B~ Development ~#"
+msgid "<< user_overview.ssi"
msgstr ""
#. type: Plain text
#: en/live-manual.ssm:39
-msgid ":B~ Project ~#"
+msgid ":B~ Development ~#"
msgstr ""
#. type: Plain text
#: en/live-manual.ssm:41
-msgid ":B~ Other ~#"
+msgid ":B~ Project ~#"
msgstr ""
#. type: Plain text
#: en/live-manual.ssm:43
-msgid "<< other_customization-packages.ssi"
+msgid ":B~ Other ~#"
msgstr ""
#. type: Plain text
#: en/live-manual.ssm:45
-msgid "<< other_customization-contents.ssi"
+msgid "<< other_customization-packages.ssi"
msgstr ""
#. type: Plain text
#: en/live-manual.ssm:47
-msgid "<< other_customization-internationalization.ssi"
+msgid "<< other_customization-contents.ssi"
msgstr ""
#. type: Plain text
#: en/live-manual.ssm:49
-msgid "<< other_customization-bootup.ssi"
+msgid "<< other_customization-internationalization.ssi"
msgstr ""
#. type: Plain text
#: en/live-manual.ssm:51
-msgid "<< other_customization-binary.ssi"
+msgid "<< other_customization-bootup.ssi"
msgstr ""
#. type: Plain text
#: en/live-manual.ssm:53
-msgid "<< other_customization-backports.ssi"
+msgid "<< other_customization-binary.ssi"
msgstr ""
#. type: Plain text
#: en/live-manual.ssm:55
-msgid "<< other_common-tasks.ssi"
+msgid "<< other_customization-backports.ssi"
msgstr ""
#. type: Plain text
#: en/live-manual.ssm:57
-msgid "<< other_live-environment.ssi"
+msgid "<< other_common-tasks.ssi"
msgstr ""
#. type: Plain text
#: en/live-manual.ssm:59
-msgid "<< other_faq.ssi"
+msgid "<< other_live-environment.ssi"
msgstr ""
#. type: Plain text
#: en/live-manual.ssm:61
-msgid "<< other_reporting-bugs.ssi"
+msgid "<< other_faq.ssi"
msgstr ""
#. type: Plain text
#: en/live-manual.ssm:63
-msgid "<< other_howtos.ssi"
+msgid "<< other_reporting-bugs.ssi"
msgstr ""
#. type: Plain text
#: en/live-manual.ssm:65
-msgid "<< other_coding-style.ssi"
+msgid "<< other_howtos.ssi"
msgstr ""
#. type: Plain text
#: en/live-manual.ssm:67
-msgid "<< other_procedures.ssi"
+msgid "<< other_coding-style.ssi"
msgstr ""
#. type: Plain text
#: en/live-manual.ssm:69
-msgid "<< other_resources.ssi"
+msgid "<< other_procedures.ssi"
msgstr ""
#. type: Plain text
#: en/live-manual.ssm:71
-msgid "<< other_use-cases.ssi"
+msgid "<< other_resources.ssi"
msgstr ""
#. type: Plain text
#: en/live-manual.ssm:73
-msgid "<< other_success-stories.ssi"
+msgid "<< other_use-cases.ssi"
msgstr ""
#. type: Plain text
#: en/live-manual.ssm:75
-msgid "<< other_troubleshooting.ssi"
+msgid "<< other_success-stories.ssi"
msgstr ""
#. type: Plain text
#: en/live-manual.ssm:77
+msgid "<< other_troubleshooting.ssi"
+msgstr ""
+
+#. type: Plain text
+#: en/live-manual.ssm:79
msgid "<< other_configuration-layout.ssi"
msgstr ""
#. type: Plain text
-#: en/live-manual.ssm:78
+#: en/live-manual.ssm:80
msgid "<< other_configuration-files.ssi"
msgstr ""
diff --git a/manual/pot/live-manual.ssm.pot b/manual/pot/live-manual.ssm.pot
index 47f8b34..9bcf6cb 100644
--- a/manual/pot/live-manual.ssm.pot
+++ b/manual/pot/live-manual.ssm.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-09-07 15:15+0300\n"
+"POT-Creation-Date: 2010-09-07 19:07+0300\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"
@@ -90,116 +90,126 @@ msgid ":B~ User ~#"
msgstr ""
#. type: Plain text
+#: en/live-manual.ssm:33
+msgid "<< user_installation.ssi"
+msgstr ""
+
+#. type: Plain text
#: en/live-manual.ssm:35
-msgid "<< user_installation.ssi << user_basics.ssi << user_overview.ssi"
+msgid "<< user_basics.ssi"
msgstr ""
#. type: Plain text
#: en/live-manual.ssm:37
-msgid ":B~ Development ~#"
+msgid "<< user_overview.ssi"
msgstr ""
#. type: Plain text
#: en/live-manual.ssm:39
-msgid ":B~ Project ~#"
+msgid ":B~ Development ~#"
msgstr ""
#. type: Plain text
#: en/live-manual.ssm:41
-msgid ":B~ Other ~#"
+msgid ":B~ Project ~#"
msgstr ""
#. type: Plain text
#: en/live-manual.ssm:43
-msgid "<< other_customization-packages.ssi"
+msgid ":B~ Other ~#"
msgstr ""
#. type: Plain text
#: en/live-manual.ssm:45
-msgid "<< other_customization-contents.ssi"
+msgid "<< other_customization-packages.ssi"
msgstr ""
#. type: Plain text
#: en/live-manual.ssm:47
-msgid "<< other_customization-internationalization.ssi"
+msgid "<< other_customization-contents.ssi"
msgstr ""
#. type: Plain text
#: en/live-manual.ssm:49
-msgid "<< other_customization-bootup.ssi"
+msgid "<< other_customization-internationalization.ssi"
msgstr ""
#. type: Plain text
#: en/live-manual.ssm:51
-msgid "<< other_customization-binary.ssi"
+msgid "<< other_customization-bootup.ssi"
msgstr ""
#. type: Plain text
#: en/live-manual.ssm:53
-msgid "<< other_customization-backports.ssi"
+msgid "<< other_customization-binary.ssi"
msgstr ""
#. type: Plain text
#: en/live-manual.ssm:55
-msgid "<< other_common-tasks.ssi"
+msgid "<< other_customization-backports.ssi"
msgstr ""
#. type: Plain text
#: en/live-manual.ssm:57
-msgid "<< other_live-environment.ssi"
+msgid "<< other_common-tasks.ssi"
msgstr ""
#. type: Plain text
#: en/live-manual.ssm:59
-msgid "<< other_faq.ssi"
+msgid "<< other_live-environment.ssi"
msgstr ""
#. type: Plain text
#: en/live-manual.ssm:61
-msgid "<< other_reporting-bugs.ssi"
+msgid "<< other_faq.ssi"
msgstr ""
#. type: Plain text
#: en/live-manual.ssm:63
-msgid "<< other_howtos.ssi"
+msgid "<< other_reporting-bugs.ssi"
msgstr ""
#. type: Plain text
#: en/live-manual.ssm:65
-msgid "<< other_coding-style.ssi"
+msgid "<< other_howtos.ssi"
msgstr ""
#. type: Plain text
#: en/live-manual.ssm:67
-msgid "<< other_procedures.ssi"
+msgid "<< other_coding-style.ssi"
msgstr ""
#. type: Plain text
#: en/live-manual.ssm:69
-msgid "<< other_resources.ssi"
+msgid "<< other_procedures.ssi"
msgstr ""
#. type: Plain text
#: en/live-manual.ssm:71
-msgid "<< other_use-cases.ssi"
+msgid "<< other_resources.ssi"
msgstr ""
#. type: Plain text
#: en/live-manual.ssm:73
-msgid "<< other_success-stories.ssi"
+msgid "<< other_use-cases.ssi"
msgstr ""
#. type: Plain text
#: en/live-manual.ssm:75
-msgid "<< other_troubleshooting.ssi"
+msgid "<< other_success-stories.ssi"
msgstr ""
#. type: Plain text
#: en/live-manual.ssm:77
+msgid "<< other_troubleshooting.ssi"
+msgstr ""
+
+#. type: Plain text
+#: en/live-manual.ssm:79
msgid "<< other_configuration-layout.ssi"
msgstr ""
#. type: Plain text
-#: en/live-manual.ssm:78
+#: en/live-manual.ssm:80
msgid "<< other_configuration-files.ssi"
msgstr ""
--
live-manual
More information about the debian-live-changes
mailing list