[SCM] live-manual branch, debian, updated. debian/2.0_a8-1-3-g696f942
Daniel Baumann
daniel at debian.org
Sun Oct 3 19:43:55 UTC 2010
The following commit has been merged in the debian branch:
commit 696f94280e8524547601077315e0d91fe271fa76
Author: Daniel Baumann <daniel at debian.org>
Date: Sun Oct 3 21:43:55 2010 +0200
Moving reviewed other_customization-internationalization to user section.
diff --git a/manual/de/live-manual.ssm b/manual/de/live-manual.ssm
index d27d569..9f7cd85 100644
--- a/manual/de/live-manual.ssm
+++ b/manual/de/live-manual.ssm
@@ -39,14 +39,14 @@
<< user_customization-contents.ssi
+<< user_customization-internationalization.ssi
+
:B~ Development ~#
:B~ Project ~#
:B~ Other ~#
-<< other_customization-internationalization.ssi
-
<< other_customization-bootup.ssi
<< other_customization-binary.ssi
diff --git a/manual/de/other_customization-internationalization.ssi b/manual/de/other_customization-internationalization.ssi
deleted file mode 100644
index 445a3e1..0000000
--- a/manual/de/other_customization-internationalization.ssi
+++ /dev/null
@@ -1,57 +0,0 @@
-B~ Customising Locale And Language
-
-1~ Customising Locale And Language
-
-2~ Default locale and keyboard
-
-The default locale when building a live cd is "locale=en_US.UTF-8". To set
-the locale for the UK (locale=en_GB.UTF-8)
-
-code{
-
-$ lh_config --bootappend-live "locale=en_GB.UTF-8"
-
-}code
-
-The entry for a British keyboard would be
-
-code{
-
-$ lh_config --bootappend-live "keyb=uk"
-
-}code
-
-To configure both the locale and the keyboard for the UK the entry would be
-
-code{
-
-$ lh_config --bootappend-live "locale=en_GB.UTF-8 keyb=uk"
-
-}code
-
-or
-
-code{
-
-$ lh_config --bootappend-live "locale=uk"
-
-}code
-
-Note: You can find a list of options in the manpage for live-initramfs. Only
-UTF8 locales are supported by live-initramfs.
-
-2~ l10n Packages
-
-lh build can automatically check for each package, for which it's know that
-there are -l10n packages available and install them. To add Swedish packages
-the entry would be
-
-code{
-
-$ lh_config --language "se"
-
-}code
-
-This will also change the default syslinux language if
-#{config/templates/syslinux/se}# is available. Check syslinux configuration
-FIXME
diff --git a/manual/en/other_customization-internationalization.ssi b/manual/de/user_customization-internationalization.ssi
similarity index 62%
copy from manual/en/other_customization-internationalization.ssi
copy to manual/de/user_customization-internationalization.ssi
index d602acc..ab1b43b 100644
--- a/manual/en/other_customization-internationalization.ssi
+++ b/manual/de/user_customization-internationalization.ssi
@@ -4,7 +4,8 @@ B~ Customising Locale And Language
2~ Default locale and keyboard
-The default locale when building a live cd is "locales=en_US.UTF-8", to set the locale for e.g. Switzerland, you can use "locales=de_CH.UTF-8".
+The default locale when building a live cd is "locales=en_US.UTF-8", to set
+the locale for e.g. Switzerland, you can use "locales=de_CH.UTF-8".
code{
@@ -28,11 +29,14 @@ $ lb config --bootappend-live ="locales=de_CH.UTF-8 keyboard-layouts=ch"
}code
-Note: You can find a list of options in the manpage for live-config. Currently, only UTF-8 locales are supported.
+Note: You can find a list of options in the manpage for
+live-config. Currently, only UTF-8 locales are supported.
2~ l10n Packages
-An experimental feature of live-build is to automatically check for each package for which it is know that there are -l10n packages available and install them. To add German packages the entry would be
+An experimental feature of live-build is to automatically check for each
+package for which it is know that there are -l10n packages available and
+install them. To add German packages the entry would be
code{
@@ -40,4 +44,6 @@ $ lh_config --language "de"
}code
-This will also change the default syslinux language if translations are available or local translations have been put into #{config/templates/syslinux/de}#.
+This will also change the default syslinux language if translations are
+available or local translations have been put into
+#{config/templates/syslinux/de}#.
diff --git a/manual/en/live-manual.ssm b/manual/en/live-manual.ssm
index eaca0b5..b492ee4 100644
--- a/manual/en/live-manual.ssm
+++ b/manual/en/live-manual.ssm
@@ -39,14 +39,14 @@
<< user_customization-contents.ssi
+<< user_customization-internationalization.ssi
+
:B~ Development ~#
:B~ Project ~#
:B~ Other ~#
-<< other_customization-internationalization.ssi
-
<< other_customization-bootup.ssi
<< other_customization-binary.ssi
diff --git a/manual/en/other_customization-internationalization.ssi b/manual/en/user_customization-internationalization.ssi
similarity index 100%
rename from manual/en/other_customization-internationalization.ssi
rename to manual/en/user_customization-internationalization.ssi
diff --git a/manual/po/de/live-manual.ssm.po b/manual/po/de/live-manual.ssm.po
index bb7f289..04207a4 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-10-03 20:30+0300\n"
+"POT-Creation-Date: 2010-10-03 21:43+0300\n"
"PO-Revision-Date: 2010-10-03 20:30+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -116,22 +116,22 @@ msgstr ""
#. type: Plain text
#: en/live-manual.ssm:43
-msgid ":B~ Development ~#"
+msgid "<< user_customization-internationalization.ssi"
msgstr ""
#. type: Plain text
#: en/live-manual.ssm:45
-msgid ":B~ Project ~#"
+msgid ":B~ Development ~#"
msgstr ""
#. type: Plain text
#: en/live-manual.ssm:47
-msgid ":B~ Other ~#"
+msgid ":B~ Project ~#"
msgstr ""
#. type: Plain text
#: en/live-manual.ssm:49
-msgid "<< other_customization-internationalization.ssi"
+msgid ":B~ Other ~#"
msgstr ""
#. type: Plain text
diff --git a/manual/po/de/other_customization-internationalization.ssi.po b/manual/po/de/user_customization-internationalization.ssi.po
similarity index 51%
rename from manual/po/de/other_customization-internationalization.ssi.po
rename to manual/po/de/user_customization-internationalization.ssi.po
index fbcfc1e..2758b3a 100644
--- a/manual/po/de/other_customization-internationalization.ssi.po
+++ b/manual/po/de/user_customization-internationalization.ssi.po
@@ -6,13 +6,13 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-03 20:30+0300\n"
-"PO-Revision-Date: 2010-10-03 20:30+0300\n"
+"POT-Creation-Date: 2010-10-03 21:43+0300\n"
+"PO-Revision-Date: 2010-10-03 21:43+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
"Language: de\n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=ASCII\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -26,39 +26,38 @@ msgstr ""
#: en/other_coding-style.ssi:106 en/other_coding-style.ssi:117
#: en/other_common-tasks.ssi:32 en/other_customization-backports.ssi:8
#: en/other_customization-bootup.ssi:30 en/other_customization-bootup.ssi:39
-#: en/other_customization-internationalization.ssi:10
-#: en/other_customization-internationalization.ssi:18
-#: en/other_customization-internationalization.ssi:26
-#: en/other_customization-internationalization.ssi:34
-#: en/other_customization-internationalization.ssi:46 en/other_faq.ssi:41
-#: en/other_faq.ssi:83 en/other_faq.ssi:103 en/other_faq.ssi:117
-#: en/other_faq.ssi:137 en/other_faq.ssi:151 en/other_faq.ssi:198
-#: en/other_faq.ssi:245 en/other_faq.ssi:261 en/other_faq.ssi:287
-#: en/other_faq.ssi:299 en/other_faq.ssi:314 en/other_faq.ssi:333
-#: en/other_faq.ssi:345 en/other_faq.ssi:353 en/other_faq.ssi:364
-#: en/other_faq.ssi:374 en/other_howtos.ssi:16 en/other_howtos.ssi:43
-#: en/other_live-environment.ssi:14 en/other_live-environment.ssi:30
-#: en/other_live-environment.ssi:51 en/other_live-environment.ssi:61
-#: en/other_live-environment.ssi:69 en/other_live-environment.ssi:77
-#: en/other_live-environment.ssi:85 en/other_live-environment.ssi:93
-#: en/other_live-environment.ssi:116 en/other_live-environment.ssi:124
-#: en/other_live-environment.ssi:133 en/other_procedures.ssi:12
-#: en/other_procedures.ssi:46 en/other_procedures.ssi:58
-#: en/other_use-cases.ssi:24 en/other_use-cases.ssi:49
-#: en/other_use-cases.ssi:75 en/other_use-cases.ssi:103
-#: en/other_use-cases.ssi:111 en/user_basics.ssi:36 en/user_basics.ssi:48
-#: en/user_basics.ssi:62 en/user_basics.ssi:74 en/user_basics.ssi:88
-#: en/user_basics.ssi:104 en/user_basics.ssi:112 en/user_basics.ssi:120
-#: en/user_basics.ssi:130 en/user_basics.ssi:142 en/user_basics.ssi:154
-#: en/user_basics.ssi:162 en/user_basics.ssi:170 en/user_basics.ssi:184
-#: en/user_basics.ssi:192 en/user_basics.ssi:202 en/user_basics.ssi:222
-#: en/user_basics.ssi:255 en/user_basics.ssi:271 en/user_basics.ssi:279
-#: en/user_basics.ssi:299 en/user_basics.ssi:324
+#: en/other_faq.ssi:41 en/other_faq.ssi:83 en/other_faq.ssi:103
+#: en/other_faq.ssi:117 en/other_faq.ssi:137 en/other_faq.ssi:151
+#: en/other_faq.ssi:198 en/other_faq.ssi:245 en/other_faq.ssi:261
+#: en/other_faq.ssi:287 en/other_faq.ssi:299 en/other_faq.ssi:314
+#: en/other_faq.ssi:333 en/other_faq.ssi:345 en/other_faq.ssi:353
+#: en/other_faq.ssi:364 en/other_faq.ssi:374 en/other_howtos.ssi:16
+#: en/other_howtos.ssi:43 en/other_live-environment.ssi:14
+#: en/other_live-environment.ssi:30 en/other_live-environment.ssi:51
+#: en/other_live-environment.ssi:61 en/other_live-environment.ssi:69
+#: en/other_live-environment.ssi:77 en/other_live-environment.ssi:85
+#: en/other_live-environment.ssi:93 en/other_live-environment.ssi:116
+#: en/other_live-environment.ssi:124 en/other_live-environment.ssi:133
+#: en/other_procedures.ssi:12 en/other_procedures.ssi:46
+#: en/other_procedures.ssi:58 en/other_use-cases.ssi:24
+#: en/other_use-cases.ssi:49 en/other_use-cases.ssi:75
+#: en/other_use-cases.ssi:103 en/other_use-cases.ssi:111 en/user_basics.ssi:36
+#: en/user_basics.ssi:48 en/user_basics.ssi:62 en/user_basics.ssi:74
+#: en/user_basics.ssi:88 en/user_basics.ssi:104 en/user_basics.ssi:112
+#: en/user_basics.ssi:120 en/user_basics.ssi:130 en/user_basics.ssi:142
+#: en/user_basics.ssi:154 en/user_basics.ssi:162 en/user_basics.ssi:170
+#: en/user_basics.ssi:184 en/user_basics.ssi:192 en/user_basics.ssi:202
+#: en/user_basics.ssi:222 en/user_basics.ssi:255 en/user_basics.ssi:271
+#: en/user_basics.ssi:279 en/user_basics.ssi:299 en/user_basics.ssi:324
#: en/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
-#: en/user_customization-contents.ssi:66 en/user_customization-packages.ssi:16
-#: en/user_customization-packages.ssi:24 en/user_customization-packages.ssi:36
-#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:59
-#: en/user_customization-packages.ssi:73
+#: en/user_customization-contents.ssi:66
+#: en/user_customization-internationalization.ssi:10
+#: en/user_customization-internationalization.ssi:18
+#: en/user_customization-internationalization.ssi:26
+#: en/user_customization-internationalization.ssi:38
+#: en/user_customization-packages.ssi:16 en/user_customization-packages.ssi:24
+#: en/user_customization-packages.ssi:36 en/user_customization-packages.ssi:45
+#: en/user_customization-packages.ssi:59 en/user_customization-packages.ssi:73
#: en/user_customization-packages.ssi:103
#: en/user_customization-packages.ssi:111
#: en/user_customization-packages.ssi:131
@@ -84,17 +83,12 @@ msgstr ""
#: en/other_coding-style.ssi:113 en/other_coding-style.ssi:124
#: en/other_common-tasks.ssi:36 en/other_customization-backports.ssi:16
#: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
-#: en/other_customization-internationalization.ssi:14
-#: en/other_customization-internationalization.ssi:22
-#: en/other_customization-internationalization.ssi:30
-#: en/other_customization-internationalization.ssi:38
-#: en/other_customization-internationalization.ssi:50 en/other_faq.ssi:37
-#: en/other_faq.ssi:46 en/other_faq.ssi:92 en/other_faq.ssi:108
-#: en/other_faq.ssi:141 en/other_faq.ssi:155 en/other_faq.ssi:207
-#: en/other_faq.ssi:256 en/other_faq.ssi:292 en/other_faq.ssi:307
-#: en/other_faq.ssi:319 en/other_faq.ssi:337 en/other_faq.ssi:349
-#: en/other_faq.ssi:358 en/other_faq.ssi:370 en/other_faq.ssi:381
-#: en/other_howtos.ssi:20 en/other_howtos.ssi:47
+#: en/other_faq.ssi:37 en/other_faq.ssi:46 en/other_faq.ssi:92
+#: en/other_faq.ssi:108 en/other_faq.ssi:141 en/other_faq.ssi:155
+#: en/other_faq.ssi:207 en/other_faq.ssi:256 en/other_faq.ssi:292
+#: en/other_faq.ssi:307 en/other_faq.ssi:319 en/other_faq.ssi:337
+#: en/other_faq.ssi:349 en/other_faq.ssi:358 en/other_faq.ssi:370
+#: en/other_faq.ssi:381 en/other_howtos.ssi:20 en/other_howtos.ssi:47
#: en/other_live-environment.ssi:18 en/other_live-environment.ssi:34
#: en/other_live-environment.ssi:55 en/other_live-environment.ssi:65
#: en/other_live-environment.ssi:73 en/other_live-environment.ssi:81
@@ -113,6 +107,10 @@ msgstr ""
#: en/user_basics.ssi:275 en/user_basics.ssi:283 en/user_basics.ssi:310
#: en/user_basics.ssi:349 en/user_customization-contents.ssi:39
#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:70
+#: en/user_customization-internationalization.ssi:14
+#: en/user_customization-internationalization.ssi:22
+#: en/user_customization-internationalization.ssi:30
+#: en/user_customization-internationalization.ssi:42
#: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
#: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
#: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
@@ -132,92 +130,82 @@ msgid "}code"
msgstr ""
#. type: Plain text
-#: en/other_customization-internationalization.ssi:2
+#: en/user_customization-internationalization.ssi:2
msgid "B~ Customising Locale And Language"
msgstr ""
#. type: Plain text
-#: en/other_customization-internationalization.ssi:4
+#: en/user_customization-internationalization.ssi:4
msgid "1~ Customising Locale And Language"
msgstr ""
#. type: Plain text
-#: en/other_customization-internationalization.ssi:6
+#: en/user_customization-internationalization.ssi:6
msgid "2~ Default locale and keyboard"
msgstr ""
#. type: Plain text
-#: en/other_customization-internationalization.ssi:8
+#: en/user_customization-internationalization.ssi:8
msgid ""
-"The default locale when building a live cd is \"locale=en_US.UTF-8\". To set "
-"the locale for the UK (locale=en_GB.UTF-8)"
+"The default locale when building a live cd is \"locales=en_US.UTF-8\", to "
+"set the locale for e.g. Switzerland, you can use \"locales=de_CH.UTF-8\"."
msgstr ""
#. type: Plain text
-#: en/other_customization-internationalization.ssi:12
-msgid "$ lh_config --bootappend-live \"locale=en_GB.UTF-8\""
+#: en/user_customization-internationalization.ssi:12
+msgid "$ lb config --bootappend-live \"locales=de_CH.UTF-8\""
msgstr ""
#. type: Plain text
-#: en/other_customization-internationalization.ssi:16
-msgid "The entry for a British keyboard would be"
+#: en/user_customization-internationalization.ssi:16
+msgid "The entry for a Swiss-German keyboard would be:"
msgstr ""
#. type: Plain text
-#: en/other_customization-internationalization.ssi:20
-msgid "$ lh_config --bootappend-live \"keyb=uk\""
+#: en/user_customization-internationalization.ssi:20
+msgid "$ lb config --bootappend-live \"keyboard-layouts=ch\""
msgstr ""
#. type: Plain text
-#: en/other_customization-internationalization.ssi:24
-msgid ""
-"To configure both the locale and the keyboard for the UK the entry would be"
-msgstr ""
-
-#. type: Plain text
-#: en/other_customization-internationalization.ssi:28
-msgid "$ lh_config --bootappend-live \"locale=en_GB.UTF-8 keyb=uk\""
+#: en/user_customization-internationalization.ssi:24
+msgid "Combined, the keyboard and locale configured for Switzerland would be:"
msgstr ""
#. type: Plain text
-#: en/other_customization-internationalization.ssi:32
-#: en/user_installation.ssi:44
-msgid "or"
-msgstr ""
-
-#. type: Plain text
-#: en/other_customization-internationalization.ssi:36
-msgid "$ lh_config --bootappend-live \"locale=uk\""
+#: en/user_customization-internationalization.ssi:28
+msgid ""
+"$ lb config --bootappend-live =\"locales=de_CH.UTF-8 keyboard-layouts=ch\""
msgstr ""
#. type: Plain text
-#: en/other_customization-internationalization.ssi:40
+#: en/user_customization-internationalization.ssi:32
msgid ""
-"Note: You can find a list of options in the manpage for live-initramfs. Only "
-"UTF8 locales are supported by live-initramfs."
+"Note: You can find a list of options in the manpage for live-config. "
+"Currently, only UTF-8 locales are supported."
msgstr ""
#. type: Plain text
-#: en/other_customization-internationalization.ssi:42
+#: en/user_customization-internationalization.ssi:34
msgid "2~ l10n Packages"
msgstr ""
#. type: Plain text
-#: en/other_customization-internationalization.ssi:44
+#: en/user_customization-internationalization.ssi:36
msgid ""
-"lh build can automatically check for each package, for which it's know that "
-"there are -l10n packages available and install them. To add Swedish packages "
-"the entry would be"
+"An experimental feature of live-build is to automatically check for each "
+"package for which it is know that there are -l10n packages available and "
+"install them. To add German packages the entry would be"
msgstr ""
#. type: Plain text
-#: en/other_customization-internationalization.ssi:48
-msgid "$ lh_config --language \"se\""
+#: en/user_customization-internationalization.ssi:40
+msgid "$ lh_config --language \"de\""
msgstr ""
#. type: Plain text
-#: en/other_customization-internationalization.ssi:51
+#: en/user_customization-internationalization.ssi:43
msgid ""
-"This will also change the default syslinux language if #{config/templates/"
-"syslinux/se}# is available. Check syslinux configuration FIXME"
+"This will also change the default syslinux language if translations are "
+"available or local translations have been put into #{config/templates/"
+"syslinux/de}#."
msgstr ""
diff --git a/manual/po/de/user_installation.ssi.po b/manual/po/de/user_installation.ssi.po
index 5e0e898..3d20eb5 100644
--- a/manual/po/de/user_installation.ssi.po
+++ b/manual/po/de/user_installation.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-03 20:30+0300\n"
+"POT-Creation-Date: 2010-10-03 21:43+0300\n"
"PO-Revision-Date: 2010-10-03 20:30+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -26,39 +26,38 @@ msgstr ""
#: en/other_coding-style.ssi:106 en/other_coding-style.ssi:117
#: en/other_common-tasks.ssi:32 en/other_customization-backports.ssi:8
#: en/other_customization-bootup.ssi:30 en/other_customization-bootup.ssi:39
-#: en/other_customization-internationalization.ssi:10
-#: en/other_customization-internationalization.ssi:18
-#: en/other_customization-internationalization.ssi:26
-#: en/other_customization-internationalization.ssi:34
-#: en/other_customization-internationalization.ssi:46 en/other_faq.ssi:41
-#: en/other_faq.ssi:83 en/other_faq.ssi:103 en/other_faq.ssi:117
-#: en/other_faq.ssi:137 en/other_faq.ssi:151 en/other_faq.ssi:198
-#: en/other_faq.ssi:245 en/other_faq.ssi:261 en/other_faq.ssi:287
-#: en/other_faq.ssi:299 en/other_faq.ssi:314 en/other_faq.ssi:333
-#: en/other_faq.ssi:345 en/other_faq.ssi:353 en/other_faq.ssi:364
-#: en/other_faq.ssi:374 en/other_howtos.ssi:16 en/other_howtos.ssi:43
-#: en/other_live-environment.ssi:14 en/other_live-environment.ssi:30
-#: en/other_live-environment.ssi:51 en/other_live-environment.ssi:61
-#: en/other_live-environment.ssi:69 en/other_live-environment.ssi:77
-#: en/other_live-environment.ssi:85 en/other_live-environment.ssi:93
-#: en/other_live-environment.ssi:116 en/other_live-environment.ssi:124
-#: en/other_live-environment.ssi:133 en/other_procedures.ssi:12
-#: en/other_procedures.ssi:46 en/other_procedures.ssi:58
-#: en/other_use-cases.ssi:24 en/other_use-cases.ssi:49
-#: en/other_use-cases.ssi:75 en/other_use-cases.ssi:103
-#: en/other_use-cases.ssi:111 en/user_basics.ssi:36 en/user_basics.ssi:48
-#: en/user_basics.ssi:62 en/user_basics.ssi:74 en/user_basics.ssi:88
-#: en/user_basics.ssi:104 en/user_basics.ssi:112 en/user_basics.ssi:120
-#: en/user_basics.ssi:130 en/user_basics.ssi:142 en/user_basics.ssi:154
-#: en/user_basics.ssi:162 en/user_basics.ssi:170 en/user_basics.ssi:184
-#: en/user_basics.ssi:192 en/user_basics.ssi:202 en/user_basics.ssi:222
-#: en/user_basics.ssi:255 en/user_basics.ssi:271 en/user_basics.ssi:279
-#: en/user_basics.ssi:299 en/user_basics.ssi:324
+#: en/other_faq.ssi:41 en/other_faq.ssi:83 en/other_faq.ssi:103
+#: en/other_faq.ssi:117 en/other_faq.ssi:137 en/other_faq.ssi:151
+#: en/other_faq.ssi:198 en/other_faq.ssi:245 en/other_faq.ssi:261
+#: en/other_faq.ssi:287 en/other_faq.ssi:299 en/other_faq.ssi:314
+#: en/other_faq.ssi:333 en/other_faq.ssi:345 en/other_faq.ssi:353
+#: en/other_faq.ssi:364 en/other_faq.ssi:374 en/other_howtos.ssi:16
+#: en/other_howtos.ssi:43 en/other_live-environment.ssi:14
+#: en/other_live-environment.ssi:30 en/other_live-environment.ssi:51
+#: en/other_live-environment.ssi:61 en/other_live-environment.ssi:69
+#: en/other_live-environment.ssi:77 en/other_live-environment.ssi:85
+#: en/other_live-environment.ssi:93 en/other_live-environment.ssi:116
+#: en/other_live-environment.ssi:124 en/other_live-environment.ssi:133
+#: en/other_procedures.ssi:12 en/other_procedures.ssi:46
+#: en/other_procedures.ssi:58 en/other_use-cases.ssi:24
+#: en/other_use-cases.ssi:49 en/other_use-cases.ssi:75
+#: en/other_use-cases.ssi:103 en/other_use-cases.ssi:111 en/user_basics.ssi:36
+#: en/user_basics.ssi:48 en/user_basics.ssi:62 en/user_basics.ssi:74
+#: en/user_basics.ssi:88 en/user_basics.ssi:104 en/user_basics.ssi:112
+#: en/user_basics.ssi:120 en/user_basics.ssi:130 en/user_basics.ssi:142
+#: en/user_basics.ssi:154 en/user_basics.ssi:162 en/user_basics.ssi:170
+#: en/user_basics.ssi:184 en/user_basics.ssi:192 en/user_basics.ssi:202
+#: en/user_basics.ssi:222 en/user_basics.ssi:255 en/user_basics.ssi:271
+#: en/user_basics.ssi:279 en/user_basics.ssi:299 en/user_basics.ssi:324
#: en/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
-#: en/user_customization-contents.ssi:66 en/user_customization-packages.ssi:16
-#: en/user_customization-packages.ssi:24 en/user_customization-packages.ssi:36
-#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:59
-#: en/user_customization-packages.ssi:73
+#: en/user_customization-contents.ssi:66
+#: en/user_customization-internationalization.ssi:10
+#: en/user_customization-internationalization.ssi:18
+#: en/user_customization-internationalization.ssi:26
+#: en/user_customization-internationalization.ssi:38
+#: en/user_customization-packages.ssi:16 en/user_customization-packages.ssi:24
+#: en/user_customization-packages.ssi:36 en/user_customization-packages.ssi:45
+#: en/user_customization-packages.ssi:59 en/user_customization-packages.ssi:73
#: en/user_customization-packages.ssi:103
#: en/user_customization-packages.ssi:111
#: en/user_customization-packages.ssi:131
@@ -84,17 +83,12 @@ msgstr ""
#: en/other_coding-style.ssi:113 en/other_coding-style.ssi:124
#: en/other_common-tasks.ssi:36 en/other_customization-backports.ssi:16
#: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
-#: en/other_customization-internationalization.ssi:14
-#: en/other_customization-internationalization.ssi:22
-#: en/other_customization-internationalization.ssi:30
-#: en/other_customization-internationalization.ssi:38
-#: en/other_customization-internationalization.ssi:50 en/other_faq.ssi:37
-#: en/other_faq.ssi:46 en/other_faq.ssi:92 en/other_faq.ssi:108
-#: en/other_faq.ssi:141 en/other_faq.ssi:155 en/other_faq.ssi:207
-#: en/other_faq.ssi:256 en/other_faq.ssi:292 en/other_faq.ssi:307
-#: en/other_faq.ssi:319 en/other_faq.ssi:337 en/other_faq.ssi:349
-#: en/other_faq.ssi:358 en/other_faq.ssi:370 en/other_faq.ssi:381
-#: en/other_howtos.ssi:20 en/other_howtos.ssi:47
+#: en/other_faq.ssi:37 en/other_faq.ssi:46 en/other_faq.ssi:92
+#: en/other_faq.ssi:108 en/other_faq.ssi:141 en/other_faq.ssi:155
+#: en/other_faq.ssi:207 en/other_faq.ssi:256 en/other_faq.ssi:292
+#: en/other_faq.ssi:307 en/other_faq.ssi:319 en/other_faq.ssi:337
+#: en/other_faq.ssi:349 en/other_faq.ssi:358 en/other_faq.ssi:370
+#: en/other_faq.ssi:381 en/other_howtos.ssi:20 en/other_howtos.ssi:47
#: en/other_live-environment.ssi:18 en/other_live-environment.ssi:34
#: en/other_live-environment.ssi:55 en/other_live-environment.ssi:65
#: en/other_live-environment.ssi:73 en/other_live-environment.ssi:81
@@ -113,6 +107,10 @@ msgstr ""
#: en/user_basics.ssi:275 en/user_basics.ssi:283 en/user_basics.ssi:310
#: en/user_basics.ssi:349 en/user_customization-contents.ssi:39
#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:70
+#: en/user_customization-internationalization.ssi:14
+#: en/user_customization-internationalization.ssi:22
+#: en/user_customization-internationalization.ssi:30
+#: en/user_customization-internationalization.ssi:42
#: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
#: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
#: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
@@ -132,12 +130,6 @@ msgid "}code"
msgstr ""
#. type: Plain text
-#: en/other_customization-internationalization.ssi:32
-#: en/user_installation.ssi:44
-msgid "or"
-msgstr ""
-
-#. type: Plain text
#: en/user_basics.ssi:12 en/user_customization-contents.ssi:26
#: en/user_installation.ssi:101
msgid "% FIXME: <xref linkend=\"terms\"/>"
@@ -243,6 +235,11 @@ msgid "# apt-get install live-build"
msgstr ""
#. type: Plain text
+#: en/user_installation.ssi:44
+msgid "or"
+msgstr ""
+
+#. type: Plain text
#: en/user_installation.ssi:48
msgid "# aptitude install live-build"
msgstr ""
diff --git a/manual/po4a.cfg b/manual/po4a.cfg
index e992ed7..2738a28 100644
--- a/manual/po4a.cfg
+++ b/manual/po4a.cfg
@@ -10,7 +10,6 @@
[type: text] en/other_customization-backports.ssi $lang:$lang/other_customization-backports.ssi
[type: text] en/other_customization-binary.ssi $lang:$lang/other_customization-binary.ssi
[type: text] en/other_customization-bootup.ssi $lang:$lang/other_customization-bootup.ssi
-[type: text] en/other_customization-internationalization.ssi $lang:$lang/other_customization-internationalization.ssi
[type: text] en/other_faq.ssi $lang:$lang/other_faq.ssi
[type: text] en/other_howtos.ssi $lang:$lang/other_howtos.ssi
[type: text] en/other_live-environment.ssi $lang:$lang/other_live-environment.ssi
@@ -22,6 +21,7 @@
[type: text] en/other_use-cases.ssi $lang:$lang/other_use-cases.ssi
[type: text] en/user_basics.ssi $lang:$lang/user_basics.ssi
[type: text] en/user_customization-contents.ssi $lang:$lang/user_customization-contents.ssi
+[type: text] en/user_customization-internationalization.ssi $lang:$lang/user_customization-internationalization.ssi
[type: text] en/user_customization-packages.ssi $lang:$lang/user_customization-packages.ssi
[type: text] en/user_installation.ssi $lang:$lang/user_installation.ssi
[type: text] en/user_overview.ssi $lang:$lang/user_overview.ssi
diff --git a/manual/pot/live-manual.ssm.pot b/manual/pot/live-manual.ssm.pot
index b5ed00f..55983ab 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-10-03 20:30+0300\n"
+"POT-Creation-Date: 2010-10-03 21:43+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"
@@ -116,22 +116,22 @@ msgstr ""
#. type: Plain text
#: en/live-manual.ssm:43
-msgid ":B~ Development ~#"
+msgid "<< user_customization-internationalization.ssi"
msgstr ""
#. type: Plain text
#: en/live-manual.ssm:45
-msgid ":B~ Project ~#"
+msgid ":B~ Development ~#"
msgstr ""
#. type: Plain text
#: en/live-manual.ssm:47
-msgid ":B~ Other ~#"
+msgid ":B~ Project ~#"
msgstr ""
#. type: Plain text
#: en/live-manual.ssm:49
-msgid "<< other_customization-internationalization.ssi"
+msgid ":B~ Other ~#"
msgstr ""
#. type: Plain text
diff --git a/manual/pot/other_customization-internationalization.ssi.pot b/manual/pot/user_customization-internationalization.ssi.pot
similarity index 52%
rename from manual/pot/other_customization-internationalization.ssi.pot
rename to manual/pot/user_customization-internationalization.ssi.pot
index 651607e..141e77f 100644
--- a/manual/pot/other_customization-internationalization.ssi.pot
+++ b/manual/pot/user_customization-internationalization.ssi.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-03 20:30+0300\n"
+"POT-Creation-Date: 2010-10-03 21:43+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"
@@ -26,39 +26,38 @@ msgstr ""
#: en/other_coding-style.ssi:106 en/other_coding-style.ssi:117
#: en/other_common-tasks.ssi:32 en/other_customization-backports.ssi:8
#: en/other_customization-bootup.ssi:30 en/other_customization-bootup.ssi:39
-#: en/other_customization-internationalization.ssi:10
-#: en/other_customization-internationalization.ssi:18
-#: en/other_customization-internationalization.ssi:26
-#: en/other_customization-internationalization.ssi:34
-#: en/other_customization-internationalization.ssi:46 en/other_faq.ssi:41
-#: en/other_faq.ssi:83 en/other_faq.ssi:103 en/other_faq.ssi:117
-#: en/other_faq.ssi:137 en/other_faq.ssi:151 en/other_faq.ssi:198
-#: en/other_faq.ssi:245 en/other_faq.ssi:261 en/other_faq.ssi:287
-#: en/other_faq.ssi:299 en/other_faq.ssi:314 en/other_faq.ssi:333
-#: en/other_faq.ssi:345 en/other_faq.ssi:353 en/other_faq.ssi:364
-#: en/other_faq.ssi:374 en/other_howtos.ssi:16 en/other_howtos.ssi:43
-#: en/other_live-environment.ssi:14 en/other_live-environment.ssi:30
-#: en/other_live-environment.ssi:51 en/other_live-environment.ssi:61
-#: en/other_live-environment.ssi:69 en/other_live-environment.ssi:77
-#: en/other_live-environment.ssi:85 en/other_live-environment.ssi:93
-#: en/other_live-environment.ssi:116 en/other_live-environment.ssi:124
-#: en/other_live-environment.ssi:133 en/other_procedures.ssi:12
-#: en/other_procedures.ssi:46 en/other_procedures.ssi:58
-#: en/other_use-cases.ssi:24 en/other_use-cases.ssi:49
-#: en/other_use-cases.ssi:75 en/other_use-cases.ssi:103
-#: en/other_use-cases.ssi:111 en/user_basics.ssi:36 en/user_basics.ssi:48
-#: en/user_basics.ssi:62 en/user_basics.ssi:74 en/user_basics.ssi:88
-#: en/user_basics.ssi:104 en/user_basics.ssi:112 en/user_basics.ssi:120
-#: en/user_basics.ssi:130 en/user_basics.ssi:142 en/user_basics.ssi:154
-#: en/user_basics.ssi:162 en/user_basics.ssi:170 en/user_basics.ssi:184
-#: en/user_basics.ssi:192 en/user_basics.ssi:202 en/user_basics.ssi:222
-#: en/user_basics.ssi:255 en/user_basics.ssi:271 en/user_basics.ssi:279
-#: en/user_basics.ssi:299 en/user_basics.ssi:324
+#: en/other_faq.ssi:41 en/other_faq.ssi:83 en/other_faq.ssi:103
+#: en/other_faq.ssi:117 en/other_faq.ssi:137 en/other_faq.ssi:151
+#: en/other_faq.ssi:198 en/other_faq.ssi:245 en/other_faq.ssi:261
+#: en/other_faq.ssi:287 en/other_faq.ssi:299 en/other_faq.ssi:314
+#: en/other_faq.ssi:333 en/other_faq.ssi:345 en/other_faq.ssi:353
+#: en/other_faq.ssi:364 en/other_faq.ssi:374 en/other_howtos.ssi:16
+#: en/other_howtos.ssi:43 en/other_live-environment.ssi:14
+#: en/other_live-environment.ssi:30 en/other_live-environment.ssi:51
+#: en/other_live-environment.ssi:61 en/other_live-environment.ssi:69
+#: en/other_live-environment.ssi:77 en/other_live-environment.ssi:85
+#: en/other_live-environment.ssi:93 en/other_live-environment.ssi:116
+#: en/other_live-environment.ssi:124 en/other_live-environment.ssi:133
+#: en/other_procedures.ssi:12 en/other_procedures.ssi:46
+#: en/other_procedures.ssi:58 en/other_use-cases.ssi:24
+#: en/other_use-cases.ssi:49 en/other_use-cases.ssi:75
+#: en/other_use-cases.ssi:103 en/other_use-cases.ssi:111 en/user_basics.ssi:36
+#: en/user_basics.ssi:48 en/user_basics.ssi:62 en/user_basics.ssi:74
+#: en/user_basics.ssi:88 en/user_basics.ssi:104 en/user_basics.ssi:112
+#: en/user_basics.ssi:120 en/user_basics.ssi:130 en/user_basics.ssi:142
+#: en/user_basics.ssi:154 en/user_basics.ssi:162 en/user_basics.ssi:170
+#: en/user_basics.ssi:184 en/user_basics.ssi:192 en/user_basics.ssi:202
+#: en/user_basics.ssi:222 en/user_basics.ssi:255 en/user_basics.ssi:271
+#: en/user_basics.ssi:279 en/user_basics.ssi:299 en/user_basics.ssi:324
#: en/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
-#: en/user_customization-contents.ssi:66 en/user_customization-packages.ssi:16
-#: en/user_customization-packages.ssi:24 en/user_customization-packages.ssi:36
-#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:59
-#: en/user_customization-packages.ssi:73
+#: en/user_customization-contents.ssi:66
+#: en/user_customization-internationalization.ssi:10
+#: en/user_customization-internationalization.ssi:18
+#: en/user_customization-internationalization.ssi:26
+#: en/user_customization-internationalization.ssi:38
+#: en/user_customization-packages.ssi:16 en/user_customization-packages.ssi:24
+#: en/user_customization-packages.ssi:36 en/user_customization-packages.ssi:45
+#: en/user_customization-packages.ssi:59 en/user_customization-packages.ssi:73
#: en/user_customization-packages.ssi:103
#: en/user_customization-packages.ssi:111
#: en/user_customization-packages.ssi:131
@@ -84,17 +83,12 @@ msgstr ""
#: en/other_coding-style.ssi:113 en/other_coding-style.ssi:124
#: en/other_common-tasks.ssi:36 en/other_customization-backports.ssi:16
#: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
-#: en/other_customization-internationalization.ssi:14
-#: en/other_customization-internationalization.ssi:22
-#: en/other_customization-internationalization.ssi:30
-#: en/other_customization-internationalization.ssi:38
-#: en/other_customization-internationalization.ssi:50 en/other_faq.ssi:37
-#: en/other_faq.ssi:46 en/other_faq.ssi:92 en/other_faq.ssi:108
-#: en/other_faq.ssi:141 en/other_faq.ssi:155 en/other_faq.ssi:207
-#: en/other_faq.ssi:256 en/other_faq.ssi:292 en/other_faq.ssi:307
-#: en/other_faq.ssi:319 en/other_faq.ssi:337 en/other_faq.ssi:349
-#: en/other_faq.ssi:358 en/other_faq.ssi:370 en/other_faq.ssi:381
-#: en/other_howtos.ssi:20 en/other_howtos.ssi:47
+#: en/other_faq.ssi:37 en/other_faq.ssi:46 en/other_faq.ssi:92
+#: en/other_faq.ssi:108 en/other_faq.ssi:141 en/other_faq.ssi:155
+#: en/other_faq.ssi:207 en/other_faq.ssi:256 en/other_faq.ssi:292
+#: en/other_faq.ssi:307 en/other_faq.ssi:319 en/other_faq.ssi:337
+#: en/other_faq.ssi:349 en/other_faq.ssi:358 en/other_faq.ssi:370
+#: en/other_faq.ssi:381 en/other_howtos.ssi:20 en/other_howtos.ssi:47
#: en/other_live-environment.ssi:18 en/other_live-environment.ssi:34
#: en/other_live-environment.ssi:55 en/other_live-environment.ssi:65
#: en/other_live-environment.ssi:73 en/other_live-environment.ssi:81
@@ -113,6 +107,10 @@ msgstr ""
#: en/user_basics.ssi:275 en/user_basics.ssi:283 en/user_basics.ssi:310
#: en/user_basics.ssi:349 en/user_customization-contents.ssi:39
#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:70
+#: en/user_customization-internationalization.ssi:14
+#: en/user_customization-internationalization.ssi:22
+#: en/user_customization-internationalization.ssi:30
+#: en/user_customization-internationalization.ssi:42
#: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
#: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
#: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
@@ -132,92 +130,82 @@ msgid "}code"
msgstr ""
#. type: Plain text
-#: en/other_customization-internationalization.ssi:2
+#: en/user_customization-internationalization.ssi:2
msgid "B~ Customising Locale And Language"
msgstr ""
#. type: Plain text
-#: en/other_customization-internationalization.ssi:4
+#: en/user_customization-internationalization.ssi:4
msgid "1~ Customising Locale And Language"
msgstr ""
#. type: Plain text
-#: en/other_customization-internationalization.ssi:6
+#: en/user_customization-internationalization.ssi:6
msgid "2~ Default locale and keyboard"
msgstr ""
#. type: Plain text
-#: en/other_customization-internationalization.ssi:8
+#: en/user_customization-internationalization.ssi:8
msgid ""
-"The default locale when building a live cd is \"locale=en_US.UTF-8\". To set "
-"the locale for the UK (locale=en_GB.UTF-8)"
+"The default locale when building a live cd is \"locales=en_US.UTF-8\", to "
+"set the locale for e.g. Switzerland, you can use \"locales=de_CH.UTF-8\"."
msgstr ""
#. type: Plain text
-#: en/other_customization-internationalization.ssi:12
-msgid "$ lh_config --bootappend-live \"locale=en_GB.UTF-8\""
+#: en/user_customization-internationalization.ssi:12
+msgid "$ lb config --bootappend-live \"locales=de_CH.UTF-8\""
msgstr ""
#. type: Plain text
-#: en/other_customization-internationalization.ssi:16
-msgid "The entry for a British keyboard would be"
+#: en/user_customization-internationalization.ssi:16
+msgid "The entry for a Swiss-German keyboard would be:"
msgstr ""
#. type: Plain text
-#: en/other_customization-internationalization.ssi:20
-msgid "$ lh_config --bootappend-live \"keyb=uk\""
+#: en/user_customization-internationalization.ssi:20
+msgid "$ lb config --bootappend-live \"keyboard-layouts=ch\""
msgstr ""
#. type: Plain text
-#: en/other_customization-internationalization.ssi:24
-msgid ""
-"To configure both the locale and the keyboard for the UK the entry would be"
-msgstr ""
-
-#. type: Plain text
-#: en/other_customization-internationalization.ssi:28
-msgid "$ lh_config --bootappend-live \"locale=en_GB.UTF-8 keyb=uk\""
+#: en/user_customization-internationalization.ssi:24
+msgid "Combined, the keyboard and locale configured for Switzerland would be:"
msgstr ""
#. type: Plain text
-#: en/other_customization-internationalization.ssi:32
-#: en/user_installation.ssi:44
-msgid "or"
-msgstr ""
-
-#. type: Plain text
-#: en/other_customization-internationalization.ssi:36
-msgid "$ lh_config --bootappend-live \"locale=uk\""
+#: en/user_customization-internationalization.ssi:28
+msgid ""
+"$ lb config --bootappend-live =\"locales=de_CH.UTF-8 keyboard-layouts=ch\""
msgstr ""
#. type: Plain text
-#: en/other_customization-internationalization.ssi:40
+#: en/user_customization-internationalization.ssi:32
msgid ""
-"Note: You can find a list of options in the manpage for live-initramfs. Only "
-"UTF8 locales are supported by live-initramfs."
+"Note: You can find a list of options in the manpage for live-config. "
+"Currently, only UTF-8 locales are supported."
msgstr ""
#. type: Plain text
-#: en/other_customization-internationalization.ssi:42
+#: en/user_customization-internationalization.ssi:34
msgid "2~ l10n Packages"
msgstr ""
#. type: Plain text
-#: en/other_customization-internationalization.ssi:44
+#: en/user_customization-internationalization.ssi:36
msgid ""
-"lh build can automatically check for each package, for which it's know that "
-"there are -l10n packages available and install them. To add Swedish packages "
-"the entry would be"
+"An experimental feature of live-build is to automatically check for each "
+"package for which it is know that there are -l10n packages available and "
+"install them. To add German packages the entry would be"
msgstr ""
#. type: Plain text
-#: en/other_customization-internationalization.ssi:48
-msgid "$ lh_config --language \"se\""
+#: en/user_customization-internationalization.ssi:40
+msgid "$ lh_config --language \"de\""
msgstr ""
#. type: Plain text
-#: en/other_customization-internationalization.ssi:51
+#: en/user_customization-internationalization.ssi:43
msgid ""
-"This will also change the default syslinux language if #{config/templates/"
-"syslinux/se}# is available. Check syslinux configuration FIXME"
+"This will also change the default syslinux language if translations are "
+"available or local translations have been put into #{config/templates/"
+"syslinux/de}#."
msgstr ""
diff --git a/manual/pot/user_installation.ssi.pot b/manual/pot/user_installation.ssi.pot
index 036cdbe..b6c7164 100644
--- a/manual/pot/user_installation.ssi.pot
+++ b/manual/pot/user_installation.ssi.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-03 20:30+0300\n"
+"POT-Creation-Date: 2010-10-03 21:43+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"
@@ -26,39 +26,38 @@ msgstr ""
#: en/other_coding-style.ssi:106 en/other_coding-style.ssi:117
#: en/other_common-tasks.ssi:32 en/other_customization-backports.ssi:8
#: en/other_customization-bootup.ssi:30 en/other_customization-bootup.ssi:39
-#: en/other_customization-internationalization.ssi:10
-#: en/other_customization-internationalization.ssi:18
-#: en/other_customization-internationalization.ssi:26
-#: en/other_customization-internationalization.ssi:34
-#: en/other_customization-internationalization.ssi:46 en/other_faq.ssi:41
-#: en/other_faq.ssi:83 en/other_faq.ssi:103 en/other_faq.ssi:117
-#: en/other_faq.ssi:137 en/other_faq.ssi:151 en/other_faq.ssi:198
-#: en/other_faq.ssi:245 en/other_faq.ssi:261 en/other_faq.ssi:287
-#: en/other_faq.ssi:299 en/other_faq.ssi:314 en/other_faq.ssi:333
-#: en/other_faq.ssi:345 en/other_faq.ssi:353 en/other_faq.ssi:364
-#: en/other_faq.ssi:374 en/other_howtos.ssi:16 en/other_howtos.ssi:43
-#: en/other_live-environment.ssi:14 en/other_live-environment.ssi:30
-#: en/other_live-environment.ssi:51 en/other_live-environment.ssi:61
-#: en/other_live-environment.ssi:69 en/other_live-environment.ssi:77
-#: en/other_live-environment.ssi:85 en/other_live-environment.ssi:93
-#: en/other_live-environment.ssi:116 en/other_live-environment.ssi:124
-#: en/other_live-environment.ssi:133 en/other_procedures.ssi:12
-#: en/other_procedures.ssi:46 en/other_procedures.ssi:58
-#: en/other_use-cases.ssi:24 en/other_use-cases.ssi:49
-#: en/other_use-cases.ssi:75 en/other_use-cases.ssi:103
-#: en/other_use-cases.ssi:111 en/user_basics.ssi:36 en/user_basics.ssi:48
-#: en/user_basics.ssi:62 en/user_basics.ssi:74 en/user_basics.ssi:88
-#: en/user_basics.ssi:104 en/user_basics.ssi:112 en/user_basics.ssi:120
-#: en/user_basics.ssi:130 en/user_basics.ssi:142 en/user_basics.ssi:154
-#: en/user_basics.ssi:162 en/user_basics.ssi:170 en/user_basics.ssi:184
-#: en/user_basics.ssi:192 en/user_basics.ssi:202 en/user_basics.ssi:222
-#: en/user_basics.ssi:255 en/user_basics.ssi:271 en/user_basics.ssi:279
-#: en/user_basics.ssi:299 en/user_basics.ssi:324
+#: en/other_faq.ssi:41 en/other_faq.ssi:83 en/other_faq.ssi:103
+#: en/other_faq.ssi:117 en/other_faq.ssi:137 en/other_faq.ssi:151
+#: en/other_faq.ssi:198 en/other_faq.ssi:245 en/other_faq.ssi:261
+#: en/other_faq.ssi:287 en/other_faq.ssi:299 en/other_faq.ssi:314
+#: en/other_faq.ssi:333 en/other_faq.ssi:345 en/other_faq.ssi:353
+#: en/other_faq.ssi:364 en/other_faq.ssi:374 en/other_howtos.ssi:16
+#: en/other_howtos.ssi:43 en/other_live-environment.ssi:14
+#: en/other_live-environment.ssi:30 en/other_live-environment.ssi:51
+#: en/other_live-environment.ssi:61 en/other_live-environment.ssi:69
+#: en/other_live-environment.ssi:77 en/other_live-environment.ssi:85
+#: en/other_live-environment.ssi:93 en/other_live-environment.ssi:116
+#: en/other_live-environment.ssi:124 en/other_live-environment.ssi:133
+#: en/other_procedures.ssi:12 en/other_procedures.ssi:46
+#: en/other_procedures.ssi:58 en/other_use-cases.ssi:24
+#: en/other_use-cases.ssi:49 en/other_use-cases.ssi:75
+#: en/other_use-cases.ssi:103 en/other_use-cases.ssi:111 en/user_basics.ssi:36
+#: en/user_basics.ssi:48 en/user_basics.ssi:62 en/user_basics.ssi:74
+#: en/user_basics.ssi:88 en/user_basics.ssi:104 en/user_basics.ssi:112
+#: en/user_basics.ssi:120 en/user_basics.ssi:130 en/user_basics.ssi:142
+#: en/user_basics.ssi:154 en/user_basics.ssi:162 en/user_basics.ssi:170
+#: en/user_basics.ssi:184 en/user_basics.ssi:192 en/user_basics.ssi:202
+#: en/user_basics.ssi:222 en/user_basics.ssi:255 en/user_basics.ssi:271
+#: en/user_basics.ssi:279 en/user_basics.ssi:299 en/user_basics.ssi:324
#: en/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
-#: en/user_customization-contents.ssi:66 en/user_customization-packages.ssi:16
-#: en/user_customization-packages.ssi:24 en/user_customization-packages.ssi:36
-#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:59
-#: en/user_customization-packages.ssi:73
+#: en/user_customization-contents.ssi:66
+#: en/user_customization-internationalization.ssi:10
+#: en/user_customization-internationalization.ssi:18
+#: en/user_customization-internationalization.ssi:26
+#: en/user_customization-internationalization.ssi:38
+#: en/user_customization-packages.ssi:16 en/user_customization-packages.ssi:24
+#: en/user_customization-packages.ssi:36 en/user_customization-packages.ssi:45
+#: en/user_customization-packages.ssi:59 en/user_customization-packages.ssi:73
#: en/user_customization-packages.ssi:103
#: en/user_customization-packages.ssi:111
#: en/user_customization-packages.ssi:131
@@ -84,17 +83,12 @@ msgstr ""
#: en/other_coding-style.ssi:113 en/other_coding-style.ssi:124
#: en/other_common-tasks.ssi:36 en/other_customization-backports.ssi:16
#: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
-#: en/other_customization-internationalization.ssi:14
-#: en/other_customization-internationalization.ssi:22
-#: en/other_customization-internationalization.ssi:30
-#: en/other_customization-internationalization.ssi:38
-#: en/other_customization-internationalization.ssi:50 en/other_faq.ssi:37
-#: en/other_faq.ssi:46 en/other_faq.ssi:92 en/other_faq.ssi:108
-#: en/other_faq.ssi:141 en/other_faq.ssi:155 en/other_faq.ssi:207
-#: en/other_faq.ssi:256 en/other_faq.ssi:292 en/other_faq.ssi:307
-#: en/other_faq.ssi:319 en/other_faq.ssi:337 en/other_faq.ssi:349
-#: en/other_faq.ssi:358 en/other_faq.ssi:370 en/other_faq.ssi:381
-#: en/other_howtos.ssi:20 en/other_howtos.ssi:47
+#: en/other_faq.ssi:37 en/other_faq.ssi:46 en/other_faq.ssi:92
+#: en/other_faq.ssi:108 en/other_faq.ssi:141 en/other_faq.ssi:155
+#: en/other_faq.ssi:207 en/other_faq.ssi:256 en/other_faq.ssi:292
+#: en/other_faq.ssi:307 en/other_faq.ssi:319 en/other_faq.ssi:337
+#: en/other_faq.ssi:349 en/other_faq.ssi:358 en/other_faq.ssi:370
+#: en/other_faq.ssi:381 en/other_howtos.ssi:20 en/other_howtos.ssi:47
#: en/other_live-environment.ssi:18 en/other_live-environment.ssi:34
#: en/other_live-environment.ssi:55 en/other_live-environment.ssi:65
#: en/other_live-environment.ssi:73 en/other_live-environment.ssi:81
@@ -113,6 +107,10 @@ msgstr ""
#: en/user_basics.ssi:275 en/user_basics.ssi:283 en/user_basics.ssi:310
#: en/user_basics.ssi:349 en/user_customization-contents.ssi:39
#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:70
+#: en/user_customization-internationalization.ssi:14
+#: en/user_customization-internationalization.ssi:22
+#: en/user_customization-internationalization.ssi:30
+#: en/user_customization-internationalization.ssi:42
#: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
#: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
#: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
@@ -132,12 +130,6 @@ msgid "}code"
msgstr ""
#. type: Plain text
-#: en/other_customization-internationalization.ssi:32
-#: en/user_installation.ssi:44
-msgid "or"
-msgstr ""
-
-#. type: Plain text
#: en/user_basics.ssi:12 en/user_customization-contents.ssi:26
#: en/user_installation.ssi:101
msgid "% FIXME: <xref linkend=\"terms\"/>"
@@ -243,6 +235,11 @@ msgid "# apt-get install live-build"
msgstr ""
#. type: Plain text
+#: en/user_installation.ssi:44
+msgid "or"
+msgstr ""
+
+#. type: Plain text
#: en/user_installation.ssi:48
msgid "# aptitude install live-build"
msgstr ""
--
live-manual
More information about the debian-live-changes
mailing list