[SCM] live-manual branch, debian, updated. debian/2.0_a10-1-9-g0b71630
Ben Armstrong
synrg at debian.org
Sat Nov 27 14:51:48 UTC 2010
The following commit has been merged in the debian branch:
commit 0b71630dd13248fdf55a146ceeda8179843516f3
Author: Ben Armstrong <synrg at debian.org>
Date: Sat Nov 27 10:51:18 2010 -0400
Fixing auto-highlight of codenames only, not release names.
diff --git a/manual/de/about_manual.ssi b/manual/de/about_manual.ssi
index 3681aa9..8155a35 100644
--- a/manual/de/about_manual.ssi
+++ b/manual/de/about_manual.ssi
@@ -72,9 +72,9 @@ Debian distribution.
_* *{Boot parameters}*: Parameters that can be entered at the bootloader
prompt to influence the kernel or live-config.
-_* *{chroot}*: The chroot program, chroot(8), enables us to run different
-instances of the GNU/Linux environment on a single system simultaneously
-without rebooting.
+_* *{chroot}*: The chroot program, #{chroot(8)}#, enables us to run
+different instances of the GNU/Linux environment on a single system
+simultaneously without rebooting.
_* *{Binary image}*: A file containing the live system, such as binary.iso
or binary.img.
@@ -82,17 +82,20 @@ or binary.img.
_* *{Target distribution}*: The distribution upon which your live system
will be based. This can differ from the distribution of your host system.
-_* *{Squeeze/Wheezy/Sid (stable/testing/unstable)}*: The stable distribution
-contains the latest officially released distribution of Debian. The testing
-distribution is the staging area for the next stable release. A major
-advantage of using this distribution is that it has more recent versions of
-software relative to the stable release. The unstable distribution is where
-active development of Debian occurs. Generally, this distribution is run by
-developers and those who like to live on the edge.
-
-At the time of writing, Squeeze is the current stable release and Wheezy is
-the current testing release. Sid will always be a synonym for the unstable
-release.
+_* *{Squeeze/Wheezy/Sid (stable/testing/unstable)}*: Debian codenames for
+releases. At the time of writing, Squeeze is the current *{stable}* release
+and Wheezy is the current *{testing}* release. Sid will always be a synonym
+for the *{unstable}* release. Throughout the manual, we tend to use
+codenames for the releases, as that is what is supported by the tools
+themselves.
+
+The *{stable}* distribution contains the latest officially released
+distribution of Debian. The *{testing}* distribution is the staging area for
+the next *{stable}* release. A major advantage of using this distribution is
+that it has more recent versions of software relative to the *{stable}*
+release. The *{unstable}* distribution is where active development of Debian
+occurs. Generally, this distribution is run by developers and those who like
+to live on the edge.
2~ Authors
diff --git a/manual/de/about_project.ssi b/manual/de/about_project.ssi
index 15fd20c..120d1e4 100644
--- a/manual/de/about_project.ssi
+++ b/manual/de/about_project.ssi
@@ -12,7 +12,7 @@ perspective most of them have one or more of the following disadvantages:
_* They are unofficial projects, developed outside of Debian.
-_* They mix different distributions, e.g. testing and unstable.
+_* They mix different distributions, e.g. *{testing}* and *{unstable}*.
_* They support i386 only.
diff --git a/manual/de/live-manual.ssm b/manual/de/live-manual.ssm
index 354e7e6..45ca328 100644
--- a/manual/de/live-manual.ssm
+++ b/manual/de/live-manual.ssm
@@ -14,7 +14,7 @@
@publisher: Debian Live Project <debian-live at lists.debian.org>
@make:
- :bold: /Squeeze|squeeze|Stable|stable|Wheezy|wheezy|Testing|testing|Sid|sid|Unstable|unstable/
+ :bold: /Squeeze|squeeze|Wheezy|wheezy|Sid|sid/
:italics: /live-boot|live-build|live-config|live-magic|live-manual|live-installer|debian-installer-launcher/
:num_top: 1
:skin: skin_debian-live
diff --git a/manual/de/project_bugs.ssi b/manual/de/project_bugs.ssi
index 8443811..a2a2de3 100644
--- a/manual/de/project_bugs.ssi
+++ b/manual/de/project_bugs.ssi
@@ -21,12 +21,13 @@ used and the distribution of the live system you are building.
2~ Known issues
-Due to the nature of Debian testing and Debian unstable distributions being
-a moving target, building a live system may not always be possible.
+Due to the nature of Debian *{testing}* and Debian *{unstable}*
+distributions being a moving target, building a live system may not always
+be possible.
-If this is a problem, do not build a system based on testing or unstable,
-but go with stable. live-build does always default to the current stable
-release.
+If this is a problem, do not build a system based on *{testing}* or
+*{unstable}*, but go with *{stable}*. live-build does always default to the
+current *{stable}* release.
Currently known issues are listed under the section 'status' on our homepage
at http://live.debian.net/
@@ -34,8 +35,9 @@ at http://live.debian.net/
It is out of the scope of this manual to train you in correctly identifying
and fixing problems in packages of the development distributions, however,
there are two things you can always try: When not succeeding to build
-testing, try if unstable works. If unstable does not work either, revert to
-testing and pinning the newer version of the failing package from unstable.
+*{testing}*, try if *{unstable}* works. If *{unstable}* does not work
+either, revert to *{testing}* and pinning the newer version of the failing
+package from *{unstable}*.
2~ Rebuild from scratch
diff --git a/manual/en/about_manual.ssi b/manual/en/about_manual.ssi
index 3fcf6d4..78bc8b0 100644
--- a/manual/en/about_manual.ssi
+++ b/manual/en/about_manual.ssi
@@ -34,15 +34,15 @@ _* *{Debian Installer (d-i)}*: The official installation system for the Debian d
_* *{Boot parameters}*: Parameters that can be entered at the bootloader prompt to influence the kernel or live-config.
-_* *{chroot}*: The chroot program, chroot(8), enables us to run different instances of the GNU/Linux environment on a single system simultaneously without rebooting.
+_* *{chroot}*: The chroot program, #{chroot(8)}#, enables us to run different instances of the GNU/Linux environment on a single system simultaneously without rebooting.
_* *{Binary image}*: A file containing the live system, such as binary.iso or binary.img.
_* *{Target distribution}*: The distribution upon which your live system will be based. This can differ from the distribution of your host system.
-_* *{Squeeze/Wheezy/Sid (stable/testing/unstable)}*: The stable distribution contains the latest officially released distribution of Debian. The testing distribution is the staging area for the next stable release. A major advantage of using this distribution is that it has more recent versions of software relative to the stable release. The unstable distribution is where active development of Debian occurs. Generally, this distribution is run by developers and those who like to live on the edge.
+_* *{Squeeze/Wheezy/Sid (stable/testing/unstable)}*: Debian codenames for releases. At the time of writing, Squeeze is the current *{stable}* release and Wheezy is the current *{testing}* release. Sid will always be a synonym for the *{unstable}* release. Throughout the manual, we tend to use codenames for the releases, as that is what is supported by the tools themselves.
-At the time of writing, Squeeze is the current stable release and Wheezy is the current testing release. Sid will always be a synonym for the unstable release.
+The *{stable}* distribution contains the latest officially released distribution of Debian. The *{testing}* distribution is the staging area for the next *{stable}* release. A major advantage of using this distribution is that it has more recent versions of software relative to the *{stable}* release. The *{unstable}* distribution is where active development of Debian occurs. Generally, this distribution is run by developers and those who like to live on the edge.
2~ Authors
diff --git a/manual/en/about_project.ssi b/manual/en/about_project.ssi
index fc4a752..4529eae 100644
--- a/manual/en/about_project.ssi
+++ b/manual/en/about_project.ssi
@@ -10,7 +10,7 @@ When Debian Live was initiated, there were already several Debian based live sys
_* They are unofficial projects, developed outside of Debian.
-_* They mix different distributions, e.g. testing and unstable.
+_* They mix different distributions, e.g. *{testing}* and *{unstable}*.
_* They support i386 only.
diff --git a/manual/en/live-manual.ssm b/manual/en/live-manual.ssm
index afd9ca6..97effe0 100644
--- a/manual/en/live-manual.ssm
+++ b/manual/en/live-manual.ssm
@@ -14,7 +14,7 @@
@publisher: Debian Live Project <debian-live at lists.debian.org>
@make:
- :bold: /Squeeze|squeeze|Stable|stable|Wheezy|wheezy|Testing|testing|Sid|sid|Unstable|unstable/
+ :bold: /Squeeze|squeeze|Wheezy|wheezy|Sid|sid/
:italics: /live-boot|live-build|live-config|live-magic|live-manual|live-installer|debian-installer-launcher/
:num_top: 1
:skin: skin_debian-live
diff --git a/manual/en/project_bugs.ssi b/manual/en/project_bugs.ssi
index b19451d..8a32ba4 100644
--- a/manual/en/project_bugs.ssi
+++ b/manual/en/project_bugs.ssi
@@ -14,13 +14,13 @@ _* Try to give *{as specific information as possible}* about the bug. This inclu
2~ Known issues
-Due to the nature of Debian testing and Debian unstable distributions being a moving target, building a live system may not always be possible.
+Due to the nature of Debian *{testing}* and Debian *{unstable}* distributions being a moving target, building a live system may not always be possible.
-If this is a problem, do not build a system based on testing or unstable, but go with stable. live-build does always default to the current stable release.
+If this is a problem, do not build a system based on *{testing}* or *{unstable}*, but go with *{stable}*. live-build does always default to the current *{stable}* release.
Currently known issues are listed under the section 'status' on our homepage at http://live.debian.net/
-It is out of the scope of this manual to train you in correctly identifying and fixing problems in packages of the development distributions, however, there are two things you can always try: When not succeeding to build testing, try if unstable works. If unstable does not work either, revert to testing and pinning the newer version of the failing package from unstable.
+It is out of the scope of this manual to train you in correctly identifying and fixing problems in packages of the development distributions, however, there are two things you can always try: When not succeeding to build *{testing}*, try if *{unstable}* works. If *{unstable}* does not work either, revert to *{testing}* and pinning the newer version of the failing package from *{unstable}*.
2~ Rebuild from scratch
diff --git a/manual/fr/about_manual.ssi b/manual/fr/about_manual.ssi
index b7f62d0..f126e59 100644
--- a/manual/fr/about_manual.ssi
+++ b/manual/fr/about_manual.ssi
@@ -76,9 +76,9 @@ distribution Debian.
_* *{Paramètres de démarrage}*: Les paramètres pouvant être entrés à
l'invite du bootloader afin de modifier le kernel ou live-config.
-_* *{chroot}*: Le programme chroot, chroot(8), nous permet de faire tourner
-plusieurs instances concurrentes de l'environnement GNU/Linux sur un système
-sans redémarrage.
+_* *{chroot}*: The chroot program, #{chroot(8)}#, enables us to run
+different instances of the GNU/Linux environment on a single system
+simultaneously without rebooting.
_* *{Image binaire}*: Un fichier contenant le système live, tel que
binary.iso ou binary.img.
@@ -87,16 +87,20 @@ _* *{Distribution de destination}*: La distribution sur laquelle votre
système live sera basée. Ceci peut varier en fonction de la distribution de
votre système hôte.
-_* *{Squeeze/Wheezy/Sid (stable/testing/unstable)}*: La distribution stable
-contient la dernière version officielle de Debian. La distribution testing
-est la future version stable où seuls les paquets suffisamment matures
-peuvent entrer. Un avantage de cette distribution est qu'elle contient des
-logiciels de versions plus récentes que la version stable. La distribution
-unstable est en constante évolution. En général cette distribution est
-utilisée par les développeurs et ceux qui aiment le risque.
-
-Au moment d'écrire ce document, Squeeze est la version Stable et Wheezy est
-la version testing. Sid restera toujours synonyme de version unstable.
+_* *{Squeeze/Wheezy/Sid (stable/testing/unstable)}*: Debian codenames for
+releases. At the time of writing, Squeeze is the current *{stable}* release
+and Wheezy is the current *{testing}* release. Sid will always be a synonym
+for the *{unstable}* release. Throughout the manual, we tend to use
+codenames for the releases, as that is what is supported by the tools
+themselves.
+
+The *{stable}* distribution contains the latest officially released
+distribution of Debian. The *{testing}* distribution is the staging area for
+the next *{stable}* release. A major advantage of using this distribution is
+that it has more recent versions of software relative to the *{stable}*
+release. The *{unstable}* distribution is where active development of Debian
+occurs. Generally, this distribution is run by developers and those who like
+to live on the edge.
2~ Auteurs
diff --git a/manual/fr/about_project.ssi b/manual/fr/about_project.ssi
index 473de07..def33ca 100644
--- a/manual/fr/about_project.ssi
+++ b/manual/fr/about_project.ssi
@@ -12,7 +12,7 @@ perspective most of them have one or more of the following disadvantages:
_* They are unofficial projects, developed outside of Debian.
-_* They mix different distributions, e.g. testing and unstable.
+_* They mix different distributions, e.g. *{testing}* and *{unstable}*.
_* They support i386 only.
diff --git a/manual/fr/live-manual.ssm b/manual/fr/live-manual.ssm
index 92bd15d..69fbc1b 100644
--- a/manual/fr/live-manual.ssm
+++ b/manual/fr/live-manual.ssm
@@ -14,7 +14,7 @@
@publisher: Debian Live Project <debian-live at lists.debian.org>
@make:
- :bold: /Squeeze|squeeze|Stable|stable|Wheezy|wheezy|Testing|testing|Sid|sid|Unstable|unstable/
+ :bold: /Squeeze|squeeze|Wheezy|wheezy|Sid|sid/
:italics: /live-boot|live-build|live-config|live-magic|live-manual|live-installer|debian-installer-launcher/
:num_top: 1
:skin: skin_debian-live
diff --git a/manual/fr/project_bugs.ssi b/manual/fr/project_bugs.ssi
index 8443811..a2a2de3 100644
--- a/manual/fr/project_bugs.ssi
+++ b/manual/fr/project_bugs.ssi
@@ -21,12 +21,13 @@ used and the distribution of the live system you are building.
2~ Known issues
-Due to the nature of Debian testing and Debian unstable distributions being
-a moving target, building a live system may not always be possible.
+Due to the nature of Debian *{testing}* and Debian *{unstable}*
+distributions being a moving target, building a live system may not always
+be possible.
-If this is a problem, do not build a system based on testing or unstable,
-but go with stable. live-build does always default to the current stable
-release.
+If this is a problem, do not build a system based on *{testing}* or
+*{unstable}*, but go with *{stable}*. live-build does always default to the
+current *{stable}* release.
Currently known issues are listed under the section 'status' on our homepage
at http://live.debian.net/
@@ -34,8 +35,9 @@ at http://live.debian.net/
It is out of the scope of this manual to train you in correctly identifying
and fixing problems in packages of the development distributions, however,
there are two things you can always try: When not succeeding to build
-testing, try if unstable works. If unstable does not work either, revert to
-testing and pinning the newer version of the failing package from unstable.
+*{testing}*, try if *{unstable}* works. If *{unstable}* does not work
+either, revert to *{testing}* and pinning the newer version of the failing
+package from *{unstable}*.
2~ Rebuild from scratch
diff --git a/manual/po/de/about_manual.ssi.po b/manual/po/de/about_manual.ssi.po
index 337b13b..b6a9b16 100644
--- a/manual/po/de/about_manual.ssi.po
+++ b/manual/po/de/about_manual.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-11-27 09:40-0400\n"
+"POT-Creation-Date: 2010-11-27 10:30-0400\n"
"PO-Revision-Date: 2010-10-22 08:36-0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -159,9 +159,9 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:38
msgid ""
-"_* *{chroot}*: The chroot program, chroot(8), enables us to run different "
-"instances of the GNU/Linux environment on a single system simultaneously "
-"without rebooting."
+"_* *{chroot}*: The chroot program, #{chroot(8)}#, enables us to run "
+"different instances of the GNU/Linux environment on a single system "
+"simultaneously without rebooting."
msgstr ""
#. type: Plain text
@@ -181,21 +181,24 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:44
msgid ""
-"_* *{Squeeze/Wheezy/Sid (stable/testing/unstable)}*: The stable distribution "
-"contains the latest officially released distribution of Debian. The testing "
-"distribution is the staging area for the next stable release. A major "
-"advantage of using this distribution is that it has more recent versions of "
-"software relative to the stable release. The unstable distribution is where "
-"active development of Debian occurs. Generally, this distribution is run by "
-"developers and those who like to live on the edge."
+"_* *{Squeeze/Wheezy/Sid (stable/testing/unstable)}*: Debian codenames for "
+"releases. At the time of writing, Squeeze is the current *{stable}* release "
+"and Wheezy is the current *{testing}* release. Sid will always be a synonym "
+"for the *{unstable}* release. Throughout the manual, we tend to use "
+"codenames for the releases, as that is what is supported by the tools "
+"themselves."
msgstr ""
#. type: Plain text
#: en/about_manual.ssi:46
msgid ""
-"At the time of writing, Squeeze is the current stable release and Wheezy is "
-"the current testing release. Sid will always be a synonym for the unstable "
-"release."
+"The *{stable}* distribution contains the latest officially released "
+"distribution of Debian. The *{testing}* distribution is the staging area for "
+"the next *{stable}* release. A major advantage of using this distribution is "
+"that it has more recent versions of software relative to the *{stable}* "
+"release. The *{unstable}* distribution is where active development of Debian "
+"occurs. Generally, this distribution is run by developers and those who like "
+"to live on the edge."
msgstr ""
#. type: Plain text
diff --git a/manual/po/de/about_project.ssi.po b/manual/po/de/about_project.ssi.po
index f41eb26..5de72d3 100644
--- a/manual/po/de/about_project.ssi.po
+++ b/manual/po/de/about_project.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-22 07:52-0200\n"
+"POT-Creation-Date: 2010-11-27 10:30-0400\n"
"PO-Revision-Date: 2010-10-03 20:30+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -51,7 +51,7 @@ msgstr ""
#. type: Plain text
#: en/about_project.ssi:14
-msgid "_* They mix different distributions, e.g. testing and unstable."
+msgid "_* They mix different distributions, e.g. *{testing}* and *{unstable}*."
msgstr ""
#. type: Plain text
diff --git a/manual/po/de/live-manual.ssm.po b/manual/po/de/live-manual.ssm.po
index e600257..6143d31 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-11-27 09:40-0400\n"
+"POT-Creation-Date: 2010-11-27 10:30-0400\n"
"PO-Revision-Date: 2010-10-03 20:30+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -58,7 +58,7 @@ msgstr ""
#, no-wrap
msgid ""
"@make:\n"
-" :bold: /Squeeze|squeeze|Stable|stable|Wheezy|wheezy|Testing|testing|Sid|sid|Unstable|unstable/\n"
+" :bold: /Squeeze|squeeze|Wheezy|wheezy|Sid|sid/\n"
" :italics: /live-boot|live-build|live-config|live-magic|live-manual|live-installer|debian-installer-launcher/\n"
" :num_top: 1\n"
" :skin: skin_debian-live\n"
diff --git a/manual/po/de/project_bugs.ssi.po b/manual/po/de/project_bugs.ssi.po
index c5e0191..8624e7e 100644
--- a/manual/po/de/project_bugs.ssi.po
+++ b/manual/po/de/project_bugs.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-27 21:40-0200\n"
+"POT-Creation-Date: 2010-11-27 10:30-0400\n"
"PO-Revision-Date: 2010-10-25 23:27+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -17,9 +17,9 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#. type: Plain text
-#: en/about_manual.ssi:80 en/about_manual.ssi:88 en/about_manual.ssi:96
-#: en/about_manual.ssi:108 en/about_manual.ssi:121 en/about_manual.ssi:134
-#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
+#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
+#: en/about_manual.ssi:112 en/about_manual.ssi:125 en/about_manual.ssi:138
+#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
#: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
#: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
#: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
@@ -39,48 +39,49 @@ msgstr ""
#: 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/project_bugs.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
-#: en/user_basics.ssi:54 en/user_basics.ssi:66 en/user_basics.ssi:78
-#: en/user_basics.ssi:88 en/user_basics.ssi:102 en/user_basics.ssi:110
-#: en/user_basics.ssi:118 en/user_basics.ssi:128 en/user_basics.ssi:140
-#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
-#: en/user_basics.ssi:182 en/user_basics.ssi:190 en/user_basics.ssi:200
-#: en/user_basics.ssi:220 en/user_basics.ssi:253 en/user_basics.ssi:269
-#: en/user_basics.ssi:277 en/user_basics.ssi:297 en/user_basics.ssi:322
-#: en/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
-#: en/user_customization-contents.ssi:66
+#: en/other_procedures.ssi:58 en/project_bugs.ssi:58 en/user_basics.ssi:32
+#: en/user_basics.ssi:42 en/user_basics.ssi:54 en/user_basics.ssi:66
+#: en/user_basics.ssi:78 en/user_basics.ssi:88 en/user_basics.ssi:102
+#: en/user_basics.ssi:110 en/user_basics.ssi:118 en/user_basics.ssi:128
+#: 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-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
-#: en/user_customization-packages.ssi:166
-#: en/user_customization-packages.ssi:176
-#: en/user_customization-packages.ssi:186
-#: en/user_customization-packages.ssi:196 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:104
-#: en/user_installation.ssi:118 en/user_installation.ssi:135
-#: en/user_managing_a_configuration.ssi:24
+#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:31
+#: en/user_customization-packages.ssi:44 en/user_customization-packages.ssi:58
+#: en/user_customization-packages.ssi:72 en/user_customization-packages.ssi:90
+#: en/user_customization-packages.ssi:120
+#: en/user_customization-packages.ssi:133
+#: en/user_customization-packages.ssi:143
+#: en/user_customization-packages.ssi:153
+#: en/user_customization-packages.ssi:163
+#: en/user_customization-packages.ssi:177
+#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:261
+#: en/user_customization-packages.ssi:273
+#: en/user_customization-packages.ssi:283 en/user_examples.ssi:12
+#: en/user_examples.ssi:27 en/user_examples.ssi:37 en/user_examples.ssi:75
+#: en/user_installation.ssi:38 en/user_installation.ssi:46
+#: en/user_installation.ssi:56 en/user_installation.ssi:64
+#: en/user_installation.ssi:76 en/user_installation.ssi:84
+#: en/user_installation.ssi:104 en/user_installation.ssi:118
+#: en/user_installation.ssi:135 en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
-#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:46
-#: en/user_overview.ssi:90 en/user_overview.ssi:98
+#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:36
+#: en/user_overview.ssi:80 en/user_overview.ssi:88
msgid "code{"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:121 en/about_manual.ssi:134 en/about_manual.ssi:142
+#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:165
#: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
#: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
#: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
@@ -100,40 +101,42 @@ msgstr ""
#: en/other_live-environment.ssi:120 en/other_live-environment.ssi:129
#: en/other_live-environment.ssi:138 en/other_procedures.ssi:16
#: en/other_procedures.ssi:54 en/other_procedures.ssi:131
-#: en/other_use-cases.ssi:33 en/other_use-cases.ssi:69
-#: en/other_use-cases.ssi:97 en/other_use-cases.ssi:107
-#: en/other_use-cases.ssi:137 en/project_bugs.ssi:62 en/user_basics.ssi:36
-#: en/user_basics.ssi:46 en/user_basics.ssi:60 en/user_basics.ssi:72
-#: en/user_basics.ssi:82 en/user_basics.ssi:94 en/user_basics.ssi:106
-#: en/user_basics.ssi:114 en/user_basics.ssi:122 en/user_basics.ssi:132
-#: en/user_basics.ssi:146 en/user_basics.ssi:156 en/user_basics.ssi:164
-#: en/user_basics.ssi:172 en/user_basics.ssi:186 en/user_basics.ssi:194
-#: en/user_basics.ssi:204 en/user_basics.ssi:245 en/user_basics.ssi:257
-#: en/user_basics.ssi:273 en/user_basics.ssi:281 en/user_basics.ssi:308
-#: en/user_basics.ssi:347 en/user_customization-contents.ssi:39
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:70
+#: en/project_bugs.ssi:62 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/user_basics.ssi:60 en/user_basics.ssi:72 en/user_basics.ssi:82
+#: en/user_basics.ssi:94 en/user_basics.ssi:106 en/user_basics.ssi:114
+#: en/user_basics.ssi:122 en/user_basics.ssi:132 en/user_basics.ssi:148
+#: en/user_basics.ssi:158 en/user_basics.ssi:166 en/user_basics.ssi:174
+#: en/user_basics.ssi:188 en/user_basics.ssi:196 en/user_basics.ssi:206
+#: en/user_basics.ssi:247 en/user_basics.ssi:259 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
-#: en/user_customization-packages.ssi:107
-#: en/user_customization-packages.ssi:115
-#: en/user_customization-packages.ssi:135
-#: en/user_customization-packages.ssi:172
-#: en/user_customization-packages.ssi:182
-#: en/user_customization-packages.ssi:192
-#: en/user_customization-packages.ssi:202 en/user_installation.ssi:42
-#: en/user_installation.ssi:50 en/user_installation.ssi:60
-#: en/user_installation.ssi:72 en/user_installation.ssi:80
-#: en/user_installation.ssi:88 en/user_installation.ssi:108
-#: en/user_installation.ssi:123 en/user_installation.ssi:138
-#: en/user_managing_a_configuration.ssi:31
+#: en/user_customization-packages.ssi:23 en/user_customization-packages.ssi:36
+#: en/user_customization-packages.ssi:48 en/user_customization-packages.ssi:62
+#: en/user_customization-packages.ssi:76 en/user_customization-packages.ssi:94
+#: en/user_customization-packages.ssi:125
+#: en/user_customization-packages.ssi:139
+#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:159
+#: en/user_customization-packages.ssi:169
+#: en/user_customization-packages.ssi:181
+#: en/user_customization-packages.ssi:197
+#: en/user_customization-packages.ssi:265
+#: en/user_customization-packages.ssi:277
+#: en/user_customization-packages.ssi:287 en/user_examples.ssi:17
+#: en/user_examples.ssi:31 en/user_examples.ssi:41 en/user_examples.ssi:84
+#: en/user_installation.ssi:42 en/user_installation.ssi:50
+#: en/user_installation.ssi:60 en/user_installation.ssi:72
+#: en/user_installation.ssi:80 en/user_installation.ssi:88
+#: en/user_installation.ssi:108 en/user_installation.ssi:123
+#: en/user_installation.ssi:138 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
-#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:84
-#: en/user_overview.ssi:94 en/user_overview.ssi:102
+#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:74
+#: en/user_overview.ssi:84 en/user_overview.ssi:92
msgid "}code"
msgstr ""
@@ -191,16 +194,17 @@ msgstr ""
#. type: Plain text
#: en/project_bugs.ssi:18
msgid ""
-"Due to the nature of Debian testing and Debian unstable distributions being "
-"a moving target, building a live system may not always be possible."
+"Due to the nature of Debian *{testing}* and Debian *{unstable}* "
+"distributions being a moving target, building a live system may not always "
+"be possible."
msgstr ""
#. type: Plain text
#: en/project_bugs.ssi:20
msgid ""
-"If this is a problem, do not build a system based on testing or unstable, "
-"but go with stable. live-build does always default to the current stable "
-"release."
+"If this is a problem, do not build a system based on *{testing}* or *"
+"{unstable}*, but go with *{stable}*. live-build does always default to the "
+"current *{stable}* release."
msgstr ""
#. type: Plain text
@@ -215,9 +219,10 @@ msgstr ""
msgid ""
"It is out of the scope of this manual to train you in correctly identifying "
"and fixing problems in packages of the development distributions, however, "
-"there are two things you can always try: When not succeeding to build "
-"testing, try if unstable works. If unstable does not work either, revert to "
-"testing and pinning the newer version of the failing package from unstable."
+"there are two things you can always try: When not succeeding to build *"
+"{testing}*, try if *{unstable}* works. If *{unstable}* does not work either, "
+"revert to *{testing}* and pinning the newer version of the failing package "
+"from *{unstable}*."
msgstr ""
#. type: Plain text
diff --git a/manual/po/fr/about_manual.ssi.po b/manual/po/fr/about_manual.ssi.po
index e1c04bb..544523b 100644
--- a/manual/po/fr/about_manual.ssi.po
+++ b/manual/po/fr/about_manual.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0~a8\n"
-"POT-Creation-Date: 2010-11-27 09:40-0400\n"
+"POT-Creation-Date: 2010-11-27 10:30-0400\n"
"PO-Revision-Date: 2010-10-27 23:14+0200\n"
"Last-Translator: Creak <romain.failliot at foolstep.com>\n"
"Language-Team: Français <debian-live at lists.debian.org>\n"
@@ -199,11 +199,11 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:38
msgid ""
-"_* *{chroot}*: The chroot program, chroot(8), enables us to run different "
-"instances of the GNU/Linux environment on a single system simultaneously "
-"without rebooting."
+"_* *{chroot}*: The chroot program, #{chroot(8)}#, enables us to run "
+"different instances of the GNU/Linux environment on a single system "
+"simultaneously without rebooting."
msgstr ""
-"_* *{chroot}*: Le programme chroot, chroot(8), nous permet de faire tourner "
+"_* *{chroot}*: Le programme chroot, #{chroot(8)}#, nous permet de faire tourner "
"plusieurs instances concurrentes de l'environnement GNU/Linux sur un système "
"sans redémarrage."
@@ -229,13 +229,34 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:44
msgid ""
-"_* *{Squeeze/Wheezy/Sid (stable/testing/unstable)}*: The stable distribution "
-"contains the latest officially released distribution of Debian. The testing "
-"distribution is the staging area for the next stable release. A major "
-"advantage of using this distribution is that it has more recent versions of "
-"software relative to the stable release. The unstable distribution is where "
-"active development of Debian occurs. Generally, this distribution is run by "
-"developers and those who like to live on the edge."
+"_* *{Squeeze/Wheezy/Sid (stable/testing/unstable)}*: Debian codenames for "
+"releases. At the time of writing, Squeeze is the current *{stable}* release "
+"and Wheezy is the current *{testing}* release. Sid will always be a synonym "
+"for the *{unstable}* release. Throughout the manual, we tend to use "
+"codenames for the releases, as that is what is supported by the tools "
+"themselves."
+msgstr ""
+
+#. type: Plain text
+#: en/about_manual.ssi:46
+#, fuzzy
+#| msgid ""
+#| "_* *{Squeeze/Wheezy/Sid (stable/testing/unstable)}*: The stable "
+#| "distribution contains the latest officially released distribution of "
+#| "Debian. The testing distribution is the staging area for the next stable "
+#| "release. A major advantage of using this distribution is that it has more "
+#| "recent versions of software relative to the stable release. The unstable "
+#| "distribution is where active development of Debian occurs. Generally, "
+#| "this distribution is run by developers and those who like to live on the "
+#| "edge."
+msgid ""
+"The *{stable}* distribution contains the latest officially released "
+"distribution of Debian. The *{testing}* distribution is the staging area for "
+"the next *{stable}* release. A major advantage of using this distribution is "
+"that it has more recent versions of software relative to the *{stable}* "
+"release. The *{unstable}* distribution is where active development of Debian "
+"occurs. Generally, this distribution is run by developers and those who like "
+"to live on the edge."
msgstr ""
"_* *{Squeeze/Wheezy/Sid (stable/testing/unstable)}*: La distribution stable "
"contient la dernière version officielle de Debian. La distribution testing "
@@ -246,16 +267,6 @@ msgstr ""
"utilisée par les développeurs et ceux qui aiment le risque."
#. type: Plain text
-#: en/about_manual.ssi:46
-msgid ""
-"At the time of writing, Squeeze is the current stable release and Wheezy is "
-"the current testing release. Sid will always be a synonym for the unstable "
-"release."
-msgstr ""
-"Au moment d'écrire ce document, Squeeze est la version Stable et Wheezy est "
-"la version testing. Sid restera toujours synonyme de version unstable."
-
-#. type: Plain text
#: en/about_manual.ssi:48
msgid "2~ Authors"
msgstr "2~ Auteurs"
diff --git a/manual/po/fr/about_project.ssi.po b/manual/po/fr/about_project.ssi.po
index d4d9b96..1e4269a 100644
--- a/manual/po/fr/about_project.ssi.po
+++ b/manual/po/fr/about_project.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-22 07:52-0200\n"
+"POT-Creation-Date: 2010-11-27 10:30-0400\n"
"PO-Revision-Date: 2010-10-16 11:30-0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -51,7 +51,7 @@ msgstr ""
#. type: Plain text
#: en/about_project.ssi:14
-msgid "_* They mix different distributions, e.g. testing and unstable."
+msgid "_* They mix different distributions, e.g. *{testing}* and *{unstable}*."
msgstr ""
#. type: Plain text
diff --git a/manual/po/fr/live-manual.ssm.po b/manual/po/fr/live-manual.ssm.po
index 7bde496..f07fd52 100644
--- a/manual/po/fr/live-manual.ssm.po
+++ b/manual/po/fr/live-manual.ssm.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-11-27 09:40-0400\n"
+"POT-Creation-Date: 2010-11-27 10:30-0400\n"
"PO-Revision-Date: 2010-10-21 07:06-0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -58,7 +58,7 @@ msgstr ""
#, no-wrap
msgid ""
"@make:\n"
-" :bold: /Squeeze|squeeze|Stable|stable|Wheezy|wheezy|Testing|testing|Sid|sid|Unstable|unstable/\n"
+" :bold: /Squeeze|squeeze|Wheezy|wheezy|Sid|sid/\n"
" :italics: /live-boot|live-build|live-config|live-magic|live-manual|live-installer|debian-installer-launcher/\n"
" :num_top: 1\n"
" :skin: skin_debian-live\n"
diff --git a/manual/po/fr/project_bugs.ssi.po b/manual/po/fr/project_bugs.ssi.po
index 17e6d7d..4d98600 100644
--- a/manual/po/fr/project_bugs.ssi.po
+++ b/manual/po/fr/project_bugs.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-27 21:40-0200\n"
+"POT-Creation-Date: 2010-11-27 10:30-0400\n"
"PO-Revision-Date: 2010-10-25 23:27+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -17,9 +17,9 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
#. type: Plain text
-#: en/about_manual.ssi:80 en/about_manual.ssi:88 en/about_manual.ssi:96
-#: en/about_manual.ssi:108 en/about_manual.ssi:121 en/about_manual.ssi:134
-#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
+#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
+#: en/about_manual.ssi:112 en/about_manual.ssi:125 en/about_manual.ssi:138
+#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
#: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
#: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
#: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
@@ -39,48 +39,49 @@ msgstr ""
#: 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/project_bugs.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
-#: en/user_basics.ssi:54 en/user_basics.ssi:66 en/user_basics.ssi:78
-#: en/user_basics.ssi:88 en/user_basics.ssi:102 en/user_basics.ssi:110
-#: en/user_basics.ssi:118 en/user_basics.ssi:128 en/user_basics.ssi:140
-#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
-#: en/user_basics.ssi:182 en/user_basics.ssi:190 en/user_basics.ssi:200
-#: en/user_basics.ssi:220 en/user_basics.ssi:253 en/user_basics.ssi:269
-#: en/user_basics.ssi:277 en/user_basics.ssi:297 en/user_basics.ssi:322
-#: en/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
-#: en/user_customization-contents.ssi:66
+#: en/other_procedures.ssi:58 en/project_bugs.ssi:58 en/user_basics.ssi:32
+#: en/user_basics.ssi:42 en/user_basics.ssi:54 en/user_basics.ssi:66
+#: en/user_basics.ssi:78 en/user_basics.ssi:88 en/user_basics.ssi:102
+#: en/user_basics.ssi:110 en/user_basics.ssi:118 en/user_basics.ssi:128
+#: 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-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
-#: en/user_customization-packages.ssi:166
-#: en/user_customization-packages.ssi:176
-#: en/user_customization-packages.ssi:186
-#: en/user_customization-packages.ssi:196 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:104
-#: en/user_installation.ssi:118 en/user_installation.ssi:135
-#: en/user_managing_a_configuration.ssi:24
+#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:31
+#: en/user_customization-packages.ssi:44 en/user_customization-packages.ssi:58
+#: en/user_customization-packages.ssi:72 en/user_customization-packages.ssi:90
+#: en/user_customization-packages.ssi:120
+#: en/user_customization-packages.ssi:133
+#: en/user_customization-packages.ssi:143
+#: en/user_customization-packages.ssi:153
+#: en/user_customization-packages.ssi:163
+#: en/user_customization-packages.ssi:177
+#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:261
+#: en/user_customization-packages.ssi:273
+#: en/user_customization-packages.ssi:283 en/user_examples.ssi:12
+#: en/user_examples.ssi:27 en/user_examples.ssi:37 en/user_examples.ssi:75
+#: en/user_installation.ssi:38 en/user_installation.ssi:46
+#: en/user_installation.ssi:56 en/user_installation.ssi:64
+#: en/user_installation.ssi:76 en/user_installation.ssi:84
+#: en/user_installation.ssi:104 en/user_installation.ssi:118
+#: en/user_installation.ssi:135 en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
-#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:46
-#: en/user_overview.ssi:90 en/user_overview.ssi:98
+#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:36
+#: en/user_overview.ssi:80 en/user_overview.ssi:88
msgid "code{"
msgstr "code{"
#. type: Plain text
-#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:121 en/about_manual.ssi:134 en/about_manual.ssi:142
+#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:165
#: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
#: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
#: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
@@ -100,40 +101,42 @@ msgstr "code{"
#: en/other_live-environment.ssi:120 en/other_live-environment.ssi:129
#: en/other_live-environment.ssi:138 en/other_procedures.ssi:16
#: en/other_procedures.ssi:54 en/other_procedures.ssi:131
-#: en/other_use-cases.ssi:33 en/other_use-cases.ssi:69
-#: en/other_use-cases.ssi:97 en/other_use-cases.ssi:107
-#: en/other_use-cases.ssi:137 en/project_bugs.ssi:62 en/user_basics.ssi:36
-#: en/user_basics.ssi:46 en/user_basics.ssi:60 en/user_basics.ssi:72
-#: en/user_basics.ssi:82 en/user_basics.ssi:94 en/user_basics.ssi:106
-#: en/user_basics.ssi:114 en/user_basics.ssi:122 en/user_basics.ssi:132
-#: en/user_basics.ssi:146 en/user_basics.ssi:156 en/user_basics.ssi:164
-#: en/user_basics.ssi:172 en/user_basics.ssi:186 en/user_basics.ssi:194
-#: en/user_basics.ssi:204 en/user_basics.ssi:245 en/user_basics.ssi:257
-#: en/user_basics.ssi:273 en/user_basics.ssi:281 en/user_basics.ssi:308
-#: en/user_basics.ssi:347 en/user_customization-contents.ssi:39
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:70
+#: en/project_bugs.ssi:62 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/user_basics.ssi:60 en/user_basics.ssi:72 en/user_basics.ssi:82
+#: en/user_basics.ssi:94 en/user_basics.ssi:106 en/user_basics.ssi:114
+#: en/user_basics.ssi:122 en/user_basics.ssi:132 en/user_basics.ssi:148
+#: en/user_basics.ssi:158 en/user_basics.ssi:166 en/user_basics.ssi:174
+#: en/user_basics.ssi:188 en/user_basics.ssi:196 en/user_basics.ssi:206
+#: en/user_basics.ssi:247 en/user_basics.ssi:259 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
-#: en/user_customization-packages.ssi:107
-#: en/user_customization-packages.ssi:115
-#: en/user_customization-packages.ssi:135
-#: en/user_customization-packages.ssi:172
-#: en/user_customization-packages.ssi:182
-#: en/user_customization-packages.ssi:192
-#: en/user_customization-packages.ssi:202 en/user_installation.ssi:42
-#: en/user_installation.ssi:50 en/user_installation.ssi:60
-#: en/user_installation.ssi:72 en/user_installation.ssi:80
-#: en/user_installation.ssi:88 en/user_installation.ssi:108
-#: en/user_installation.ssi:123 en/user_installation.ssi:138
-#: en/user_managing_a_configuration.ssi:31
+#: en/user_customization-packages.ssi:23 en/user_customization-packages.ssi:36
+#: en/user_customization-packages.ssi:48 en/user_customization-packages.ssi:62
+#: en/user_customization-packages.ssi:76 en/user_customization-packages.ssi:94
+#: en/user_customization-packages.ssi:125
+#: en/user_customization-packages.ssi:139
+#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:159
+#: en/user_customization-packages.ssi:169
+#: en/user_customization-packages.ssi:181
+#: en/user_customization-packages.ssi:197
+#: en/user_customization-packages.ssi:265
+#: en/user_customization-packages.ssi:277
+#: en/user_customization-packages.ssi:287 en/user_examples.ssi:17
+#: en/user_examples.ssi:31 en/user_examples.ssi:41 en/user_examples.ssi:84
+#: en/user_installation.ssi:42 en/user_installation.ssi:50
+#: en/user_installation.ssi:60 en/user_installation.ssi:72
+#: en/user_installation.ssi:80 en/user_installation.ssi:88
+#: en/user_installation.ssi:108 en/user_installation.ssi:123
+#: en/user_installation.ssi:138 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
-#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:84
-#: en/user_overview.ssi:94 en/user_overview.ssi:102
+#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:74
+#: en/user_overview.ssi:84 en/user_overview.ssi:92
msgid "}code"
msgstr "}code"
@@ -191,16 +194,17 @@ msgstr ""
#. type: Plain text
#: en/project_bugs.ssi:18
msgid ""
-"Due to the nature of Debian testing and Debian unstable distributions being "
-"a moving target, building a live system may not always be possible."
+"Due to the nature of Debian *{testing}* and Debian *{unstable}* "
+"distributions being a moving target, building a live system may not always "
+"be possible."
msgstr ""
#. type: Plain text
#: en/project_bugs.ssi:20
msgid ""
-"If this is a problem, do not build a system based on testing or unstable, "
-"but go with stable. live-build does always default to the current stable "
-"release."
+"If this is a problem, do not build a system based on *{testing}* or *"
+"{unstable}*, but go with *{stable}*. live-build does always default to the "
+"current *{stable}* release."
msgstr ""
#. type: Plain text
@@ -215,9 +219,10 @@ msgstr ""
msgid ""
"It is out of the scope of this manual to train you in correctly identifying "
"and fixing problems in packages of the development distributions, however, "
-"there are two things you can always try: When not succeeding to build "
-"testing, try if unstable works. If unstable does not work either, revert to "
-"testing and pinning the newer version of the failing package from unstable."
+"there are two things you can always try: When not succeeding to build *"
+"{testing}*, try if *{unstable}* works. If *{unstable}* does not work either, "
+"revert to *{testing}* and pinning the newer version of the failing package "
+"from *{unstable}*."
msgstr ""
#. type: Plain text
diff --git a/manual/po/pt_BR/about_manual.ssi.po b/manual/po/pt_BR/about_manual.ssi.po
index 866825c..cc662dc 100644
--- a/manual/po/pt_BR/about_manual.ssi.po
+++ b/manual/po/pt_BR/about_manual.ssi.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0~a8\n"
-"POT-Creation-Date: 2010-11-27 09:40-0400\n"
+"POT-Creation-Date: 2010-11-27 10:30-0400\n"
"PO-Revision-Date: 2010-10-22 18:16-0300\n"
"Last-Translator: Bruno Gurgel <bruno.gurgel at gmail.com>\n"
"Language-Team: none\n"
@@ -194,11 +194,11 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:38
msgid ""
-"_* *{chroot}*: The chroot program, chroot(8), enables us to run different "
-"instances of the GNU/Linux environment on a single system simultaneously "
-"without rebooting."
+"_* *{chroot}*: The chroot program, #{chroot(8)}#, enables us to run "
+"different instances of the GNU/Linux environment on a single system "
+"simultaneously without rebooting."
msgstr ""
-"_* *{chroot}*: O programa chroot, chroot(8), nos habilita a rodar "
+"_* *{chroot}*: O programa chroot, #{chroot(8)}#, nos habilita a rodar "
"simultâneamente diferentes instâncias do ambiente do GNU/Linux em um único "
"sistema sem reinicialização."
@@ -223,13 +223,34 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:44
msgid ""
-"_* *{Squeeze/Wheezy/Sid (stable/testing/unstable)}*: The stable distribution "
-"contains the latest officially released distribution of Debian. The testing "
-"distribution is the staging area for the next stable release. A major "
-"advantage of using this distribution is that it has more recent versions of "
-"software relative to the stable release. The unstable distribution is where "
-"active development of Debian occurs. Generally, this distribution is run by "
-"developers and those who like to live on the edge."
+"_* *{Squeeze/Wheezy/Sid (stable/testing/unstable)}*: Debian codenames for "
+"releases. At the time of writing, Squeeze is the current *{stable}* release "
+"and Wheezy is the current *{testing}* release. Sid will always be a synonym "
+"for the *{unstable}* release. Throughout the manual, we tend to use "
+"codenames for the releases, as that is what is supported by the tools "
+"themselves."
+msgstr ""
+
+#. type: Plain text
+#: en/about_manual.ssi:46
+#, fuzzy
+#| msgid ""
+#| "_* *{Squeeze/Wheezy/Sid (stable/testing/unstable)}*: The stable "
+#| "distribution contains the latest officially released distribution of "
+#| "Debian. The testing distribution is the staging area for the next stable "
+#| "release. A major advantage of using this distribution is that it has more "
+#| "recent versions of software relative to the stable release. The unstable "
+#| "distribution is where active development of Debian occurs. Generally, "
+#| "this distribution is run by developers and those who like to live on the "
+#| "edge."
+msgid ""
+"The *{stable}* distribution contains the latest officially released "
+"distribution of Debian. The *{testing}* distribution is the staging area for "
+"the next *{stable}* release. A major advantage of using this distribution is "
+"that it has more recent versions of software relative to the *{stable}* "
+"release. The *{unstable}* distribution is where active development of Debian "
+"occurs. Generally, this distribution is run by developers and those who like "
+"to live on the edge."
msgstr ""
"_* *{Squeeze/Wheezy/Sid (stable/testing/unstable)}*: A distribuição estável"
"(stable) contem a última versão oficial lançada do Debian. A distribuição "
@@ -240,17 +261,6 @@ msgstr ""
"distribuição é mantida por desenvolvedores e aqueles que vivem no limite."
#. type: Plain text
-#: en/about_manual.ssi:46
-msgid ""
-"At the time of writing, Squeeze is the current stable release and Wheezy is "
-"the current testing release. Sid will always be a synonym for the unstable "
-"release."
-msgstr ""
-"No tempo da escrita, Squeeze é o a atual versão estável(stable) e Wheezy é a "
-"atual versão testing. Sid sempre será um sinônimo para a versão instável"
-"(unstable)."
-
-#. type: Plain text
#: en/about_manual.ssi:48
msgid "2~ Authors"
msgstr "2~Autores"
diff --git a/manual/po/pt_BR/about_project.ssi.po b/manual/po/pt_BR/about_project.ssi.po
index ee490b7..35d76f9 100644
--- a/manual/po/pt_BR/about_project.ssi.po
+++ b/manual/po/pt_BR/about_project.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-22 07:52-0200\n"
+"POT-Creation-Date: 2010-11-27 10:30-0400\n"
"PO-Revision-Date: 2010-10-22 07:52-0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -51,7 +51,7 @@ msgstr ""
#. type: Plain text
#: en/about_project.ssi:14
-msgid "_* They mix different distributions, e.g. testing and unstable."
+msgid "_* They mix different distributions, e.g. *{testing}* and *{unstable}*."
msgstr ""
#. type: Plain text
diff --git a/manual/po/pt_BR/live-manual.ssm.po b/manual/po/pt_BR/live-manual.ssm.po
index 76baaf3..f89abc6 100644
--- a/manual/po/pt_BR/live-manual.ssm.po
+++ b/manual/po/pt_BR/live-manual.ssm.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-11-27 09:40-0400\n"
+"POT-Creation-Date: 2010-11-27 10:30-0400\n"
"PO-Revision-Date: 2010-10-22 07:52-0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -58,7 +58,7 @@ msgstr ""
#, no-wrap
msgid ""
"@make:\n"
-" :bold: /Squeeze|squeeze|Stable|stable|Wheezy|wheezy|Testing|testing|Sid|sid|Unstable|unstable/\n"
+" :bold: /Squeeze|squeeze|Wheezy|wheezy|Sid|sid/\n"
" :italics: /live-boot|live-build|live-config|live-magic|live-manual|live-installer|debian-installer-launcher/\n"
" :num_top: 1\n"
" :skin: skin_debian-live\n"
diff --git a/manual/po/pt_BR/project_bugs.ssi.po b/manual/po/pt_BR/project_bugs.ssi.po
index 553bccf..c06bd20 100644
--- a/manual/po/pt_BR/project_bugs.ssi.po
+++ b/manual/po/pt_BR/project_bugs.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-27 21:40-0200\n"
+"POT-Creation-Date: 2010-11-27 10:30-0400\n"
"PO-Revision-Date: 2010-10-25 23:27+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -17,9 +17,9 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
#. type: Plain text
-#: en/about_manual.ssi:80 en/about_manual.ssi:88 en/about_manual.ssi:96
-#: en/about_manual.ssi:108 en/about_manual.ssi:121 en/about_manual.ssi:134
-#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
+#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
+#: en/about_manual.ssi:112 en/about_manual.ssi:125 en/about_manual.ssi:138
+#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
#: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
#: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
#: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
@@ -39,48 +39,49 @@ msgstr ""
#: 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/project_bugs.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
-#: en/user_basics.ssi:54 en/user_basics.ssi:66 en/user_basics.ssi:78
-#: en/user_basics.ssi:88 en/user_basics.ssi:102 en/user_basics.ssi:110
-#: en/user_basics.ssi:118 en/user_basics.ssi:128 en/user_basics.ssi:140
-#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
-#: en/user_basics.ssi:182 en/user_basics.ssi:190 en/user_basics.ssi:200
-#: en/user_basics.ssi:220 en/user_basics.ssi:253 en/user_basics.ssi:269
-#: en/user_basics.ssi:277 en/user_basics.ssi:297 en/user_basics.ssi:322
-#: en/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
-#: en/user_customization-contents.ssi:66
+#: en/other_procedures.ssi:58 en/project_bugs.ssi:58 en/user_basics.ssi:32
+#: en/user_basics.ssi:42 en/user_basics.ssi:54 en/user_basics.ssi:66
+#: en/user_basics.ssi:78 en/user_basics.ssi:88 en/user_basics.ssi:102
+#: en/user_basics.ssi:110 en/user_basics.ssi:118 en/user_basics.ssi:128
+#: 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-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
-#: en/user_customization-packages.ssi:166
-#: en/user_customization-packages.ssi:176
-#: en/user_customization-packages.ssi:186
-#: en/user_customization-packages.ssi:196 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:104
-#: en/user_installation.ssi:118 en/user_installation.ssi:135
-#: en/user_managing_a_configuration.ssi:24
+#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:31
+#: en/user_customization-packages.ssi:44 en/user_customization-packages.ssi:58
+#: en/user_customization-packages.ssi:72 en/user_customization-packages.ssi:90
+#: en/user_customization-packages.ssi:120
+#: en/user_customization-packages.ssi:133
+#: en/user_customization-packages.ssi:143
+#: en/user_customization-packages.ssi:153
+#: en/user_customization-packages.ssi:163
+#: en/user_customization-packages.ssi:177
+#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:261
+#: en/user_customization-packages.ssi:273
+#: en/user_customization-packages.ssi:283 en/user_examples.ssi:12
+#: en/user_examples.ssi:27 en/user_examples.ssi:37 en/user_examples.ssi:75
+#: en/user_installation.ssi:38 en/user_installation.ssi:46
+#: en/user_installation.ssi:56 en/user_installation.ssi:64
+#: en/user_installation.ssi:76 en/user_installation.ssi:84
+#: en/user_installation.ssi:104 en/user_installation.ssi:118
+#: en/user_installation.ssi:135 en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
-#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:46
-#: en/user_overview.ssi:90 en/user_overview.ssi:98
+#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:36
+#: en/user_overview.ssi:80 en/user_overview.ssi:88
msgid "code{"
msgstr "code{"
#. type: Plain text
-#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:121 en/about_manual.ssi:134 en/about_manual.ssi:142
+#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:165
#: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
#: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
#: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
@@ -100,40 +101,42 @@ msgstr "code{"
#: en/other_live-environment.ssi:120 en/other_live-environment.ssi:129
#: en/other_live-environment.ssi:138 en/other_procedures.ssi:16
#: en/other_procedures.ssi:54 en/other_procedures.ssi:131
-#: en/other_use-cases.ssi:33 en/other_use-cases.ssi:69
-#: en/other_use-cases.ssi:97 en/other_use-cases.ssi:107
-#: en/other_use-cases.ssi:137 en/project_bugs.ssi:62 en/user_basics.ssi:36
-#: en/user_basics.ssi:46 en/user_basics.ssi:60 en/user_basics.ssi:72
-#: en/user_basics.ssi:82 en/user_basics.ssi:94 en/user_basics.ssi:106
-#: en/user_basics.ssi:114 en/user_basics.ssi:122 en/user_basics.ssi:132
-#: en/user_basics.ssi:146 en/user_basics.ssi:156 en/user_basics.ssi:164
-#: en/user_basics.ssi:172 en/user_basics.ssi:186 en/user_basics.ssi:194
-#: en/user_basics.ssi:204 en/user_basics.ssi:245 en/user_basics.ssi:257
-#: en/user_basics.ssi:273 en/user_basics.ssi:281 en/user_basics.ssi:308
-#: en/user_basics.ssi:347 en/user_customization-contents.ssi:39
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:70
+#: en/project_bugs.ssi:62 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/user_basics.ssi:60 en/user_basics.ssi:72 en/user_basics.ssi:82
+#: en/user_basics.ssi:94 en/user_basics.ssi:106 en/user_basics.ssi:114
+#: en/user_basics.ssi:122 en/user_basics.ssi:132 en/user_basics.ssi:148
+#: en/user_basics.ssi:158 en/user_basics.ssi:166 en/user_basics.ssi:174
+#: en/user_basics.ssi:188 en/user_basics.ssi:196 en/user_basics.ssi:206
+#: en/user_basics.ssi:247 en/user_basics.ssi:259 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
-#: en/user_customization-packages.ssi:107
-#: en/user_customization-packages.ssi:115
-#: en/user_customization-packages.ssi:135
-#: en/user_customization-packages.ssi:172
-#: en/user_customization-packages.ssi:182
-#: en/user_customization-packages.ssi:192
-#: en/user_customization-packages.ssi:202 en/user_installation.ssi:42
-#: en/user_installation.ssi:50 en/user_installation.ssi:60
-#: en/user_installation.ssi:72 en/user_installation.ssi:80
-#: en/user_installation.ssi:88 en/user_installation.ssi:108
-#: en/user_installation.ssi:123 en/user_installation.ssi:138
-#: en/user_managing_a_configuration.ssi:31
+#: en/user_customization-packages.ssi:23 en/user_customization-packages.ssi:36
+#: en/user_customization-packages.ssi:48 en/user_customization-packages.ssi:62
+#: en/user_customization-packages.ssi:76 en/user_customization-packages.ssi:94
+#: en/user_customization-packages.ssi:125
+#: en/user_customization-packages.ssi:139
+#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:159
+#: en/user_customization-packages.ssi:169
+#: en/user_customization-packages.ssi:181
+#: en/user_customization-packages.ssi:197
+#: en/user_customization-packages.ssi:265
+#: en/user_customization-packages.ssi:277
+#: en/user_customization-packages.ssi:287 en/user_examples.ssi:17
+#: en/user_examples.ssi:31 en/user_examples.ssi:41 en/user_examples.ssi:84
+#: en/user_installation.ssi:42 en/user_installation.ssi:50
+#: en/user_installation.ssi:60 en/user_installation.ssi:72
+#: en/user_installation.ssi:80 en/user_installation.ssi:88
+#: en/user_installation.ssi:108 en/user_installation.ssi:123
+#: en/user_installation.ssi:138 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
-#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:84
-#: en/user_overview.ssi:94 en/user_overview.ssi:102
+#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:74
+#: en/user_overview.ssi:84 en/user_overview.ssi:92
msgid "}code"
msgstr "}code"
@@ -191,16 +194,17 @@ msgstr ""
#. type: Plain text
#: en/project_bugs.ssi:18
msgid ""
-"Due to the nature of Debian testing and Debian unstable distributions being "
-"a moving target, building a live system may not always be possible."
+"Due to the nature of Debian *{testing}* and Debian *{unstable}* "
+"distributions being a moving target, building a live system may not always "
+"be possible."
msgstr ""
#. type: Plain text
#: en/project_bugs.ssi:20
msgid ""
-"If this is a problem, do not build a system based on testing or unstable, "
-"but go with stable. live-build does always default to the current stable "
-"release."
+"If this is a problem, do not build a system based on *{testing}* or *"
+"{unstable}*, but go with *{stable}*. live-build does always default to the "
+"current *{stable}* release."
msgstr ""
#. type: Plain text
@@ -215,9 +219,10 @@ msgstr ""
msgid ""
"It is out of the scope of this manual to train you in correctly identifying "
"and fixing problems in packages of the development distributions, however, "
-"there are two things you can always try: When not succeeding to build "
-"testing, try if unstable works. If unstable does not work either, revert to "
-"testing and pinning the newer version of the failing package from unstable."
+"there are two things you can always try: When not succeeding to build *"
+"{testing}*, try if *{unstable}* works. If *{unstable}* does not work either, "
+"revert to *{testing}* and pinning the newer version of the failing package "
+"from *{unstable}*."
msgstr ""
#. type: Plain text
diff --git a/manual/po/ro/about_manual.ssi.po b/manual/po/ro/about_manual.ssi.po
index 7b242a6..37867c4 100644
--- a/manual/po/ro/about_manual.ssi.po
+++ b/manual/po/ro/about_manual.ssi.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0~a8\n"
-"POT-Creation-Date: 2010-11-27 09:40-0400\n"
+"POT-Creation-Date: 2010-11-27 10:30-0400\n"
"PO-Revision-Date: 2010-10-23 10:34-0200\n"
"Last-Translator: Eugen Paiuc <linux51 at bluewin.ch>\n"
"Language-Team: none\n"
@@ -191,11 +191,11 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:38
msgid ""
-"_* *{chroot}*: The chroot program, chroot(8), enables us to run different "
-"instances of the GNU/Linux environment on a single system simultaneously "
-"without rebooting."
+"_* *{chroot}*: The chroot program, #{chroot(8)}#, enables us to run "
+"different instances of the GNU/Linux environment on a single system "
+"simultaneously without rebooting."
msgstr ""
-"_* *{chroot}*: Programul chroot , chroot(8), permite rularea a diferite "
+"_* *{chroot}*: Programul chroot, #{chroot(8)}#, permite rularea a diferite "
"instante din mediul GNU/Linux pe un singur sistem si in simultan fara a "
"necesita o repornire a sistemului."
@@ -220,13 +220,34 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:44
msgid ""
-"_* *{Squeeze/Wheezy/Sid (stable/testing/unstable)}*: The stable distribution "
-"contains the latest officially released distribution of Debian. The testing "
-"distribution is the staging area for the next stable release. A major "
-"advantage of using this distribution is that it has more recent versions of "
-"software relative to the stable release. The unstable distribution is where "
-"active development of Debian occurs. Generally, this distribution is run by "
-"developers and those who like to live on the edge."
+"_* *{Squeeze/Wheezy/Sid (stable/testing/unstable)}*: Debian codenames for "
+"releases. At the time of writing, Squeeze is the current *{stable}* release "
+"and Wheezy is the current *{testing}* release. Sid will always be a synonym "
+"for the *{unstable}* release. Throughout the manual, we tend to use "
+"codenames for the releases, as that is what is supported by the tools "
+"themselves."
+msgstr ""
+
+#. type: Plain text
+#: en/about_manual.ssi:46
+#, fuzzy
+#| msgid ""
+#| "_* *{Squeeze/Wheezy/Sid (stable/testing/unstable)}*: The stable "
+#| "distribution contains the latest officially released distribution of "
+#| "Debian. The testing distribution is the staging area for the next stable "
+#| "release. A major advantage of using this distribution is that it has more "
+#| "recent versions of software relative to the stable release. The unstable "
+#| "distribution is where active development of Debian occurs. Generally, "
+#| "this distribution is run by developers and those who like to live on the "
+#| "edge."
+msgid ""
+"The *{stable}* distribution contains the latest officially released "
+"distribution of Debian. The *{testing}* distribution is the staging area for "
+"the next *{stable}* release. A major advantage of using this distribution is "
+"that it has more recent versions of software relative to the *{stable}* "
+"release. The *{unstable}* distribution is where active development of Debian "
+"occurs. Generally, this distribution is run by developers and those who like "
+"to live on the edge."
msgstr ""
"_* *{Squeeze/Wheezy/Sid (stable/testing/unstable)}*: stable contine ultima "
"versiune oficiala a distributiei Debian. testing este sursa pentru "
@@ -237,17 +258,6 @@ msgstr ""
"riscul ... ."
#. type: Plain text
-#: en/about_manual.ssi:46
-msgid ""
-"At the time of writing, Squeeze is the current stable release and Wheezy is "
-"the current testing release. Sid will always be a synonym for the unstable "
-"release."
-msgstr ""
-"La momentul in care au fost scrise aceste randurei, versiunea stable este "
-"Squeeze, Wheezy estei versiunea testing. Sid va fi mereu simbolul versiunii "
-"unstable."
-
-#. type: Plain text
#: en/about_manual.ssi:48
msgid "2~ Authors"
msgstr "2~ Autori"
diff --git a/manual/po/ro/about_project.ssi.po b/manual/po/ro/about_project.ssi.po
index 215cc92..33794a0 100644
--- a/manual/po/ro/about_project.ssi.po
+++ b/manual/po/ro/about_project.ssi.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: 2.0~a8\n"
-"POT-Creation-Date: 2010-10-22 07:52-0200\n"
+"POT-Creation-Date: 2010-11-27 10:30-0400\n"
"Last-Translator: Eugen Paiuc <linux51 at bluewin.ch>\n"
#. type: Plain text
@@ -46,8 +46,8 @@ msgstr "_* Sunt proiecte neoficiale, dezvoltate in afara proiectului Debian."
#. type: Plain text
#: en/about_project.ssi:14
-msgid "_* They mix different distributions, e.g. testing and unstable."
-msgstr "_* Ele amalgameaza diferite distributii, ca testing si unstable."
+msgid "_* They mix different distributions, e.g. *{testing}* and *{unstable}*."
+msgstr "_* Ele amalgameaza diferite distributii, ca *{testing}* si *{unstable}*."
#. type: Plain text
#: en/about_project.ssi:16
diff --git a/manual/po/ro/live-manual.ssm.po b/manual/po/ro/live-manual.ssm.po
index 9792ac7..dd921f2 100644
--- a/manual/po/ro/live-manual.ssm.po
+++ b/manual/po/ro/live-manual.ssm.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-11-27 09:40-0400\n"
+"POT-Creation-Date: 2010-11-27 10:30-0400\n"
"PO-Revision-Date: 2010-10-23 00:04+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -59,7 +59,7 @@ msgstr ""
#, no-wrap
msgid ""
"@make:\n"
-" :bold: /Squeeze|squeeze|Stable|stable|Wheezy|wheezy|Testing|testing|Sid|sid|Unstable|unstable/\n"
+" :bold: /Squeeze|squeeze|Wheezy|wheezy|Sid|sid/\n"
" :italics: /live-boot|live-build|live-config|live-magic|live-manual|live-installer|debian-installer-launcher/\n"
" :num_top: 1\n"
" :skin: skin_debian-live\n"
diff --git a/manual/po/ro/project_bugs.ssi.po b/manual/po/ro/project_bugs.ssi.po
index 011847e..e36f4c3 100644
--- a/manual/po/ro/project_bugs.ssi.po
+++ b/manual/po/ro/project_bugs.ssi.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-27 21:40-0200\n"
+"POT-Creation-Date: 2010-11-27 10:30-0400\n"
"PO-Revision-Date: 2010-10-27 22:56+0200\n"
"Last-Translator: Creak <romain.failliot at foolstep.com>\n"
"Language-Team: Français <debian-live at lists.debian.org>\n"
@@ -18,9 +18,9 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n > 1)\n"
#. type: Plain text
-#: en/about_manual.ssi:80 en/about_manual.ssi:88 en/about_manual.ssi:96
-#: en/about_manual.ssi:108 en/about_manual.ssi:121 en/about_manual.ssi:134
-#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
+#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
+#: en/about_manual.ssi:112 en/about_manual.ssi:125 en/about_manual.ssi:138
+#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
#: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
#: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
#: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
@@ -40,48 +40,49 @@ msgstr ""
#: 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/project_bugs.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
-#: en/user_basics.ssi:54 en/user_basics.ssi:66 en/user_basics.ssi:78
-#: en/user_basics.ssi:88 en/user_basics.ssi:102 en/user_basics.ssi:110
-#: en/user_basics.ssi:118 en/user_basics.ssi:128 en/user_basics.ssi:140
-#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
-#: en/user_basics.ssi:182 en/user_basics.ssi:190 en/user_basics.ssi:200
-#: en/user_basics.ssi:220 en/user_basics.ssi:253 en/user_basics.ssi:269
-#: en/user_basics.ssi:277 en/user_basics.ssi:297 en/user_basics.ssi:322
-#: en/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
-#: en/user_customization-contents.ssi:66
+#: en/other_procedures.ssi:58 en/project_bugs.ssi:58 en/user_basics.ssi:32
+#: en/user_basics.ssi:42 en/user_basics.ssi:54 en/user_basics.ssi:66
+#: en/user_basics.ssi:78 en/user_basics.ssi:88 en/user_basics.ssi:102
+#: en/user_basics.ssi:110 en/user_basics.ssi:118 en/user_basics.ssi:128
+#: 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-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
-#: en/user_customization-packages.ssi:166
-#: en/user_customization-packages.ssi:176
-#: en/user_customization-packages.ssi:186
-#: en/user_customization-packages.ssi:196 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:104
-#: en/user_installation.ssi:118 en/user_installation.ssi:135
-#: en/user_managing_a_configuration.ssi:24
+#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:31
+#: en/user_customization-packages.ssi:44 en/user_customization-packages.ssi:58
+#: en/user_customization-packages.ssi:72 en/user_customization-packages.ssi:90
+#: en/user_customization-packages.ssi:120
+#: en/user_customization-packages.ssi:133
+#: en/user_customization-packages.ssi:143
+#: en/user_customization-packages.ssi:153
+#: en/user_customization-packages.ssi:163
+#: en/user_customization-packages.ssi:177
+#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:261
+#: en/user_customization-packages.ssi:273
+#: en/user_customization-packages.ssi:283 en/user_examples.ssi:12
+#: en/user_examples.ssi:27 en/user_examples.ssi:37 en/user_examples.ssi:75
+#: en/user_installation.ssi:38 en/user_installation.ssi:46
+#: en/user_installation.ssi:56 en/user_installation.ssi:64
+#: en/user_installation.ssi:76 en/user_installation.ssi:84
+#: en/user_installation.ssi:104 en/user_installation.ssi:118
+#: en/user_installation.ssi:135 en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
-#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:46
-#: en/user_overview.ssi:90 en/user_overview.ssi:98
+#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:36
+#: en/user_overview.ssi:80 en/user_overview.ssi:88
msgid "code{"
msgstr "code{"
#. type: Plain text
-#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:121 en/about_manual.ssi:134 en/about_manual.ssi:142
+#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:165
#: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
#: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
#: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
@@ -101,40 +102,42 @@ msgstr "code{"
#: en/other_live-environment.ssi:120 en/other_live-environment.ssi:129
#: en/other_live-environment.ssi:138 en/other_procedures.ssi:16
#: en/other_procedures.ssi:54 en/other_procedures.ssi:131
-#: en/other_use-cases.ssi:33 en/other_use-cases.ssi:69
-#: en/other_use-cases.ssi:97 en/other_use-cases.ssi:107
-#: en/other_use-cases.ssi:137 en/project_bugs.ssi:62 en/user_basics.ssi:36
-#: en/user_basics.ssi:46 en/user_basics.ssi:60 en/user_basics.ssi:72
-#: en/user_basics.ssi:82 en/user_basics.ssi:94 en/user_basics.ssi:106
-#: en/user_basics.ssi:114 en/user_basics.ssi:122 en/user_basics.ssi:132
-#: en/user_basics.ssi:146 en/user_basics.ssi:156 en/user_basics.ssi:164
-#: en/user_basics.ssi:172 en/user_basics.ssi:186 en/user_basics.ssi:194
-#: en/user_basics.ssi:204 en/user_basics.ssi:245 en/user_basics.ssi:257
-#: en/user_basics.ssi:273 en/user_basics.ssi:281 en/user_basics.ssi:308
-#: en/user_basics.ssi:347 en/user_customization-contents.ssi:39
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:70
+#: en/project_bugs.ssi:62 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/user_basics.ssi:60 en/user_basics.ssi:72 en/user_basics.ssi:82
+#: en/user_basics.ssi:94 en/user_basics.ssi:106 en/user_basics.ssi:114
+#: en/user_basics.ssi:122 en/user_basics.ssi:132 en/user_basics.ssi:148
+#: en/user_basics.ssi:158 en/user_basics.ssi:166 en/user_basics.ssi:174
+#: en/user_basics.ssi:188 en/user_basics.ssi:196 en/user_basics.ssi:206
+#: en/user_basics.ssi:247 en/user_basics.ssi:259 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
-#: en/user_customization-packages.ssi:107
-#: en/user_customization-packages.ssi:115
-#: en/user_customization-packages.ssi:135
-#: en/user_customization-packages.ssi:172
-#: en/user_customization-packages.ssi:182
-#: en/user_customization-packages.ssi:192
-#: en/user_customization-packages.ssi:202 en/user_installation.ssi:42
-#: en/user_installation.ssi:50 en/user_installation.ssi:60
-#: en/user_installation.ssi:72 en/user_installation.ssi:80
-#: en/user_installation.ssi:88 en/user_installation.ssi:108
-#: en/user_installation.ssi:123 en/user_installation.ssi:138
-#: en/user_managing_a_configuration.ssi:31
+#: en/user_customization-packages.ssi:23 en/user_customization-packages.ssi:36
+#: en/user_customization-packages.ssi:48 en/user_customization-packages.ssi:62
+#: en/user_customization-packages.ssi:76 en/user_customization-packages.ssi:94
+#: en/user_customization-packages.ssi:125
+#: en/user_customization-packages.ssi:139
+#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:159
+#: en/user_customization-packages.ssi:169
+#: en/user_customization-packages.ssi:181
+#: en/user_customization-packages.ssi:197
+#: en/user_customization-packages.ssi:265
+#: en/user_customization-packages.ssi:277
+#: en/user_customization-packages.ssi:287 en/user_examples.ssi:17
+#: en/user_examples.ssi:31 en/user_examples.ssi:41 en/user_examples.ssi:84
+#: en/user_installation.ssi:42 en/user_installation.ssi:50
+#: en/user_installation.ssi:60 en/user_installation.ssi:72
+#: en/user_installation.ssi:80 en/user_installation.ssi:88
+#: en/user_installation.ssi:108 en/user_installation.ssi:123
+#: en/user_installation.ssi:138 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
-#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:84
-#: en/user_overview.ssi:94 en/user_overview.ssi:102
+#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:74
+#: en/user_overview.ssi:84 en/user_overview.ssi:92
msgid "}code"
msgstr "}code"
@@ -192,16 +195,17 @@ msgstr ""
#. type: Plain text
#: en/project_bugs.ssi:18
msgid ""
-"Due to the nature of Debian testing and Debian unstable distributions being "
-"a moving target, building a live system may not always be possible."
+"Due to the nature of Debian *{testing}* and Debian *{unstable}* "
+"distributions being a moving target, building a live system may not always "
+"be possible."
msgstr ""
#. type: Plain text
#: en/project_bugs.ssi:20
msgid ""
-"If this is a problem, do not build a system based on testing or unstable, "
-"but go with stable. live-build does always default to the current stable "
-"release."
+"If this is a problem, do not build a system based on *{testing}* or *"
+"{unstable}*, but go with *{stable}*. live-build does always default to the "
+"current *{stable}* release."
msgstr ""
#. type: Plain text
@@ -216,9 +220,10 @@ msgstr ""
msgid ""
"It is out of the scope of this manual to train you in correctly identifying "
"and fixing problems in packages of the development distributions, however, "
-"there are two things you can always try: When not succeeding to build "
-"testing, try if unstable works. If unstable does not work either, revert to "
-"testing and pinning the newer version of the failing package from unstable."
+"there are two things you can always try: When not succeeding to build *"
+"{testing}*, try if *{unstable}* works. If *{unstable}* does not work either, "
+"revert to *{testing}* and pinning the newer version of the failing package "
+"from *{unstable}*."
msgstr ""
#. type: Plain text
diff --git a/manual/pot/about_manual.ssi.pot b/manual/pot/about_manual.ssi.pot
index 8ad7579..2084698 100644
--- a/manual/pot/about_manual.ssi.pot
+++ b/manual/pot/about_manual.ssi.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-11-27 09:40-0400\n"
+"POT-Creation-Date: 2010-11-27 10:30-0400\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"
@@ -159,9 +159,9 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:38
msgid ""
-"_* *{chroot}*: The chroot program, chroot(8), enables us to run different "
-"instances of the GNU/Linux environment on a single system simultaneously "
-"without rebooting."
+"_* *{chroot}*: The chroot program, #{chroot(8)}#, enables us to run "
+"different instances of the GNU/Linux environment on a single system "
+"simultaneously without rebooting."
msgstr ""
#. type: Plain text
@@ -181,21 +181,24 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:44
msgid ""
-"_* *{Squeeze/Wheezy/Sid (stable/testing/unstable)}*: The stable distribution "
-"contains the latest officially released distribution of Debian. The testing "
-"distribution is the staging area for the next stable release. A major "
-"advantage of using this distribution is that it has more recent versions of "
-"software relative to the stable release. The unstable distribution is where "
-"active development of Debian occurs. Generally, this distribution is run by "
-"developers and those who like to live on the edge."
+"_* *{Squeeze/Wheezy/Sid (stable/testing/unstable)}*: Debian codenames for "
+"releases. At the time of writing, Squeeze is the current *{stable}* release "
+"and Wheezy is the current *{testing}* release. Sid will always be a synonym "
+"for the *{unstable}* release. Throughout the manual, we tend to use "
+"codenames for the releases, as that is what is supported by the tools "
+"themselves."
msgstr ""
#. type: Plain text
#: en/about_manual.ssi:46
msgid ""
-"At the time of writing, Squeeze is the current stable release and Wheezy is "
-"the current testing release. Sid will always be a synonym for the unstable "
-"release."
+"The *{stable}* distribution contains the latest officially released "
+"distribution of Debian. The *{testing}* distribution is the staging area for "
+"the next *{stable}* release. A major advantage of using this distribution is "
+"that it has more recent versions of software relative to the *{stable}* "
+"release. The *{unstable}* distribution is where active development of Debian "
+"occurs. Generally, this distribution is run by developers and those who like "
+"to live on the edge."
msgstr ""
#. type: Plain text
diff --git a/manual/pot/about_project.ssi.pot b/manual/pot/about_project.ssi.pot
index 5e4edf1..344dafa 100644
--- a/manual/pot/about_project.ssi.pot
+++ b/manual/pot/about_project.ssi.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-22 07:52-0200\n"
+"POT-Creation-Date: 2010-11-27 10:30-0400\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"
@@ -51,7 +51,7 @@ msgstr ""
#. type: Plain text
#: en/about_project.ssi:14
-msgid "_* They mix different distributions, e.g. testing and unstable."
+msgid "_* They mix different distributions, e.g. *{testing}* and *{unstable}*."
msgstr ""
#. type: Plain text
diff --git a/manual/pot/live-manual.ssm.pot b/manual/pot/live-manual.ssm.pot
index e511a52..83424bd 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-11-27 09:40-0400\n"
+"POT-Creation-Date: 2010-11-27 10:30-0400\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"
@@ -58,7 +58,7 @@ msgstr ""
#, no-wrap
msgid ""
"@make:\n"
-" :bold: /Squeeze|squeeze|Stable|stable|Wheezy|wheezy|Testing|testing|Sid|sid|Unstable|unstable/\n"
+" :bold: /Squeeze|squeeze|Wheezy|wheezy|Sid|sid/\n"
" :italics: /live-boot|live-build|live-config|live-magic|live-manual|live-installer|debian-installer-launcher/\n"
" :num_top: 1\n"
" :skin: skin_debian-live\n"
diff --git a/manual/pot/project_bugs.ssi.pot b/manual/pot/project_bugs.ssi.pot
index dc6fde9..fa8f7c3 100644
--- a/manual/pot/project_bugs.ssi.pot
+++ b/manual/pot/project_bugs.ssi.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-27 21:40-0200\n"
+"POT-Creation-Date: 2010-11-27 10:30-0400\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"
@@ -17,9 +17,9 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
#. type: Plain text
-#: en/about_manual.ssi:80 en/about_manual.ssi:88 en/about_manual.ssi:96
-#: en/about_manual.ssi:108 en/about_manual.ssi:121 en/about_manual.ssi:134
-#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
+#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
+#: en/about_manual.ssi:112 en/about_manual.ssi:125 en/about_manual.ssi:138
+#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
#: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
#: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
#: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
@@ -39,48 +39,49 @@ msgstr ""
#: 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/project_bugs.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
-#: en/user_basics.ssi:54 en/user_basics.ssi:66 en/user_basics.ssi:78
-#: en/user_basics.ssi:88 en/user_basics.ssi:102 en/user_basics.ssi:110
-#: en/user_basics.ssi:118 en/user_basics.ssi:128 en/user_basics.ssi:140
-#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
-#: en/user_basics.ssi:182 en/user_basics.ssi:190 en/user_basics.ssi:200
-#: en/user_basics.ssi:220 en/user_basics.ssi:253 en/user_basics.ssi:269
-#: en/user_basics.ssi:277 en/user_basics.ssi:297 en/user_basics.ssi:322
-#: en/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
-#: en/user_customization-contents.ssi:66
+#: en/other_procedures.ssi:58 en/project_bugs.ssi:58 en/user_basics.ssi:32
+#: en/user_basics.ssi:42 en/user_basics.ssi:54 en/user_basics.ssi:66
+#: en/user_basics.ssi:78 en/user_basics.ssi:88 en/user_basics.ssi:102
+#: en/user_basics.ssi:110 en/user_basics.ssi:118 en/user_basics.ssi:128
+#: 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-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
-#: en/user_customization-packages.ssi:166
-#: en/user_customization-packages.ssi:176
-#: en/user_customization-packages.ssi:186
-#: en/user_customization-packages.ssi:196 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:104
-#: en/user_installation.ssi:118 en/user_installation.ssi:135
-#: en/user_managing_a_configuration.ssi:24
+#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:31
+#: en/user_customization-packages.ssi:44 en/user_customization-packages.ssi:58
+#: en/user_customization-packages.ssi:72 en/user_customization-packages.ssi:90
+#: en/user_customization-packages.ssi:120
+#: en/user_customization-packages.ssi:133
+#: en/user_customization-packages.ssi:143
+#: en/user_customization-packages.ssi:153
+#: en/user_customization-packages.ssi:163
+#: en/user_customization-packages.ssi:177
+#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:261
+#: en/user_customization-packages.ssi:273
+#: en/user_customization-packages.ssi:283 en/user_examples.ssi:12
+#: en/user_examples.ssi:27 en/user_examples.ssi:37 en/user_examples.ssi:75
+#: en/user_installation.ssi:38 en/user_installation.ssi:46
+#: en/user_installation.ssi:56 en/user_installation.ssi:64
+#: en/user_installation.ssi:76 en/user_installation.ssi:84
+#: en/user_installation.ssi:104 en/user_installation.ssi:118
+#: en/user_installation.ssi:135 en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
-#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:46
-#: en/user_overview.ssi:90 en/user_overview.ssi:98
+#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:36
+#: en/user_overview.ssi:80 en/user_overview.ssi:88
msgid "code{"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:121 en/about_manual.ssi:134 en/about_manual.ssi:142
+#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:165
#: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
#: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
#: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
@@ -100,40 +101,42 @@ msgstr ""
#: en/other_live-environment.ssi:120 en/other_live-environment.ssi:129
#: en/other_live-environment.ssi:138 en/other_procedures.ssi:16
#: en/other_procedures.ssi:54 en/other_procedures.ssi:131
-#: en/other_use-cases.ssi:33 en/other_use-cases.ssi:69
-#: en/other_use-cases.ssi:97 en/other_use-cases.ssi:107
-#: en/other_use-cases.ssi:137 en/project_bugs.ssi:62 en/user_basics.ssi:36
-#: en/user_basics.ssi:46 en/user_basics.ssi:60 en/user_basics.ssi:72
-#: en/user_basics.ssi:82 en/user_basics.ssi:94 en/user_basics.ssi:106
-#: en/user_basics.ssi:114 en/user_basics.ssi:122 en/user_basics.ssi:132
-#: en/user_basics.ssi:146 en/user_basics.ssi:156 en/user_basics.ssi:164
-#: en/user_basics.ssi:172 en/user_basics.ssi:186 en/user_basics.ssi:194
-#: en/user_basics.ssi:204 en/user_basics.ssi:245 en/user_basics.ssi:257
-#: en/user_basics.ssi:273 en/user_basics.ssi:281 en/user_basics.ssi:308
-#: en/user_basics.ssi:347 en/user_customization-contents.ssi:39
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:70
+#: en/project_bugs.ssi:62 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/user_basics.ssi:60 en/user_basics.ssi:72 en/user_basics.ssi:82
+#: en/user_basics.ssi:94 en/user_basics.ssi:106 en/user_basics.ssi:114
+#: en/user_basics.ssi:122 en/user_basics.ssi:132 en/user_basics.ssi:148
+#: en/user_basics.ssi:158 en/user_basics.ssi:166 en/user_basics.ssi:174
+#: en/user_basics.ssi:188 en/user_basics.ssi:196 en/user_basics.ssi:206
+#: en/user_basics.ssi:247 en/user_basics.ssi:259 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
-#: en/user_customization-packages.ssi:107
-#: en/user_customization-packages.ssi:115
-#: en/user_customization-packages.ssi:135
-#: en/user_customization-packages.ssi:172
-#: en/user_customization-packages.ssi:182
-#: en/user_customization-packages.ssi:192
-#: en/user_customization-packages.ssi:202 en/user_installation.ssi:42
-#: en/user_installation.ssi:50 en/user_installation.ssi:60
-#: en/user_installation.ssi:72 en/user_installation.ssi:80
-#: en/user_installation.ssi:88 en/user_installation.ssi:108
-#: en/user_installation.ssi:123 en/user_installation.ssi:138
-#: en/user_managing_a_configuration.ssi:31
+#: en/user_customization-packages.ssi:23 en/user_customization-packages.ssi:36
+#: en/user_customization-packages.ssi:48 en/user_customization-packages.ssi:62
+#: en/user_customization-packages.ssi:76 en/user_customization-packages.ssi:94
+#: en/user_customization-packages.ssi:125
+#: en/user_customization-packages.ssi:139
+#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:159
+#: en/user_customization-packages.ssi:169
+#: en/user_customization-packages.ssi:181
+#: en/user_customization-packages.ssi:197
+#: en/user_customization-packages.ssi:265
+#: en/user_customization-packages.ssi:277
+#: en/user_customization-packages.ssi:287 en/user_examples.ssi:17
+#: en/user_examples.ssi:31 en/user_examples.ssi:41 en/user_examples.ssi:84
+#: en/user_installation.ssi:42 en/user_installation.ssi:50
+#: en/user_installation.ssi:60 en/user_installation.ssi:72
+#: en/user_installation.ssi:80 en/user_installation.ssi:88
+#: en/user_installation.ssi:108 en/user_installation.ssi:123
+#: en/user_installation.ssi:138 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
-#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:84
-#: en/user_overview.ssi:94 en/user_overview.ssi:102
+#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:74
+#: en/user_overview.ssi:84 en/user_overview.ssi:92
msgid "}code"
msgstr ""
@@ -191,16 +194,17 @@ msgstr ""
#. type: Plain text
#: en/project_bugs.ssi:18
msgid ""
-"Due to the nature of Debian testing and Debian unstable distributions being "
-"a moving target, building a live system may not always be possible."
+"Due to the nature of Debian *{testing}* and Debian *{unstable}* "
+"distributions being a moving target, building a live system may not always "
+"be possible."
msgstr ""
#. type: Plain text
#: en/project_bugs.ssi:20
msgid ""
-"If this is a problem, do not build a system based on testing or unstable, "
-"but go with stable. live-build does always default to the current stable "
-"release."
+"If this is a problem, do not build a system based on *{testing}* or *"
+"{unstable}*, but go with *{stable}*. live-build does always default to the "
+"current *{stable}* release."
msgstr ""
#. type: Plain text
@@ -215,9 +219,10 @@ msgstr ""
msgid ""
"It is out of the scope of this manual to train you in correctly identifying "
"and fixing problems in packages of the development distributions, however, "
-"there are two things you can always try: When not succeeding to build "
-"testing, try if unstable works. If unstable does not work either, revert to "
-"testing and pinning the newer version of the failing package from unstable."
+"there are two things you can always try: When not succeeding to build *"
+"{testing}*, try if *{unstable}* works. If *{unstable}* does not work either, "
+"revert to *{testing}* and pinning the newer version of the failing package "
+"from *{unstable}*."
msgstr ""
#. type: Plain text
diff --git a/manual/pt_BR/about_manual.ssi b/manual/pt_BR/about_manual.ssi
index 084264f..b3b1e87 100644
--- a/manual/pt_BR/about_manual.ssi
+++ b/manual/pt_BR/about_manual.ssi
@@ -74,9 +74,9 @@ distribuição Debian.
_* *{Boot parameters}*: Parametros que podem ser entrados no prompt do
bootloader para influenciar o kernel ou o live-config.
-_* *{chroot}*: O programa chroot, chroot(8), nos habilita a rodar
-simultâneamente diferentes instâncias do ambiente do GNU/Linux em um único
-sistema sem reinicialização.
+_* *{chroot}*: The chroot program, #{chroot(8)}#, enables us to run
+different instances of the GNU/Linux environment on a single system
+simultaneously without rebooting.
_* *{Binary image}*: Um arquivo contendo o sistema live, como binary.iso ou
binary.img.
@@ -84,18 +84,20 @@ binary.img.
_* *{Target distribution}*: A distribuição em que o sistema live será
baseado. Isso pode diferir da distribuição do seu sistema host.
-_* *{Squeeze/Wheezy/Sid (stable/testing/unstable)}*: A distribuição
-estável(stable) contem a última versão oficial lançada do Debian. A
-distribuição "Testing" é a ária de estágio para a próxima versão
-estável(stable). A maior vantagem de usar essa distribuição é que ela tem
-versões mais recentes de software relacionado com a versão
-estável(stable). A distribuição instável(unstable) é onde ocorre o
-desenvolvimento ativo do Debian. Geralmente, essa distribuição é mantida por
-desenvolvedores e aqueles que vivem no limite.
-
-No tempo da escrita, Squeeze é o a atual versão estável(stable) e Wheezy é a
-atual versão testing. Sid sempre será um sinônimo para a versão
-instável(unstable).
+_* *{Squeeze/Wheezy/Sid (stable/testing/unstable)}*: Debian codenames for
+releases. At the time of writing, Squeeze is the current *{stable}* release
+and Wheezy is the current *{testing}* release. Sid will always be a synonym
+for the *{unstable}* release. Throughout the manual, we tend to use
+codenames for the releases, as that is what is supported by the tools
+themselves.
+
+The *{stable}* distribution contains the latest officially released
+distribution of Debian. The *{testing}* distribution is the staging area for
+the next *{stable}* release. A major advantage of using this distribution is
+that it has more recent versions of software relative to the *{stable}*
+release. The *{unstable}* distribution is where active development of Debian
+occurs. Generally, this distribution is run by developers and those who like
+to live on the edge.
2~Autores
diff --git a/manual/pt_BR/about_project.ssi b/manual/pt_BR/about_project.ssi
index 473de07..def33ca 100644
--- a/manual/pt_BR/about_project.ssi
+++ b/manual/pt_BR/about_project.ssi
@@ -12,7 +12,7 @@ perspective most of them have one or more of the following disadvantages:
_* They are unofficial projects, developed outside of Debian.
-_* They mix different distributions, e.g. testing and unstable.
+_* They mix different distributions, e.g. *{testing}* and *{unstable}*.
_* They support i386 only.
diff --git a/manual/pt_BR/live-manual.ssm b/manual/pt_BR/live-manual.ssm
index 92bd15d..69fbc1b 100644
--- a/manual/pt_BR/live-manual.ssm
+++ b/manual/pt_BR/live-manual.ssm
@@ -14,7 +14,7 @@
@publisher: Debian Live Project <debian-live at lists.debian.org>
@make:
- :bold: /Squeeze|squeeze|Stable|stable|Wheezy|wheezy|Testing|testing|Sid|sid|Unstable|unstable/
+ :bold: /Squeeze|squeeze|Wheezy|wheezy|Sid|sid/
:italics: /live-boot|live-build|live-config|live-magic|live-manual|live-installer|debian-installer-launcher/
:num_top: 1
:skin: skin_debian-live
diff --git a/manual/pt_BR/project_bugs.ssi b/manual/pt_BR/project_bugs.ssi
index 8443811..a2a2de3 100644
--- a/manual/pt_BR/project_bugs.ssi
+++ b/manual/pt_BR/project_bugs.ssi
@@ -21,12 +21,13 @@ used and the distribution of the live system you are building.
2~ Known issues
-Due to the nature of Debian testing and Debian unstable distributions being
-a moving target, building a live system may not always be possible.
+Due to the nature of Debian *{testing}* and Debian *{unstable}*
+distributions being a moving target, building a live system may not always
+be possible.
-If this is a problem, do not build a system based on testing or unstable,
-but go with stable. live-build does always default to the current stable
-release.
+If this is a problem, do not build a system based on *{testing}* or
+*{unstable}*, but go with *{stable}*. live-build does always default to the
+current *{stable}* release.
Currently known issues are listed under the section 'status' on our homepage
at http://live.debian.net/
@@ -34,8 +35,9 @@ at http://live.debian.net/
It is out of the scope of this manual to train you in correctly identifying
and fixing problems in packages of the development distributions, however,
there are two things you can always try: When not succeeding to build
-testing, try if unstable works. If unstable does not work either, revert to
-testing and pinning the newer version of the failing package from unstable.
+*{testing}*, try if *{unstable}* works. If *{unstable}* does not work
+either, revert to *{testing}* and pinning the newer version of the failing
+package from *{unstable}*.
2~ Rebuild from scratch
diff --git a/manual/ro/about_manual.ssi b/manual/ro/about_manual.ssi
index f1f1f35..fa8d0cf 100644
--- a/manual/ro/about_manual.ssi
+++ b/manual/ro/about_manual.ssi
@@ -72,9 +72,9 @@ distributia Debian.
_* *{Boot parameters}*: Parameti care pot fi adaugati la promptul
bootloader-ului care sa infuenteze kernelul sau live-config.
-_* *{chroot}*: Programul chroot , chroot(8), permite rularea a diferite
-instante din mediul GNU/Linux pe un singur sistem si in simultan fara a
-necesita o repornire a sistemului.
+_* *{chroot}*: The chroot program, #{chroot(8)}#, enables us to run
+different instances of the GNU/Linux environment on a single system
+simultaneously without rebooting.
_* *{Binary image}*: Un fisier ce contine sistemul live, ca de exemplu
binary.iso sau binary.img.
@@ -82,17 +82,20 @@ binary.iso sau binary.img.
_* *{Target distribution}*: Dea pe care se bazeaza sistemul live. Aceasta
distributie poate fi diferita de cea a sistemului gazda.
-_* *{Squeeze/Wheezy/Sid (stable/testing/unstable)}*: stable contine ultima
-versiune oficiala a distributiei Debian. testing este sursa pentru
-urmatoarea versiune stable. Pricipalul avantaj la folosirea distibutiei
-testing este folosirea programelor mai noi decat cele din
-stable. Distributia unstable este locul unde au loc activ dezvoltarile din
-Debian. In general ea este folosita de dezvoltatori sau de cei ce le place
-riscul ... .
-
-La momentul in care au fost scrise aceste randurei, versiunea stable este
-Squeeze, Wheezy estei versiunea testing. Sid va fi mereu simbolul versiunii
-unstable.
+_* *{Squeeze/Wheezy/Sid (stable/testing/unstable)}*: Debian codenames for
+releases. At the time of writing, Squeeze is the current *{stable}* release
+and Wheezy is the current *{testing}* release. Sid will always be a synonym
+for the *{unstable}* release. Throughout the manual, we tend to use
+codenames for the releases, as that is what is supported by the tools
+themselves.
+
+The *{stable}* distribution contains the latest officially released
+distribution of Debian. The *{testing}* distribution is the staging area for
+the next *{stable}* release. A major advantage of using this distribution is
+that it has more recent versions of software relative to the *{stable}*
+release. The *{unstable}* distribution is where active development of Debian
+occurs. Generally, this distribution is run by developers and those who like
+to live on the edge.
2~ Autori
diff --git a/manual/ro/about_project.ssi b/manual/ro/about_project.ssi
index 49a81c2..0d26211 100644
--- a/manual/ro/about_project.ssi
+++ b/manual/ro/about_project.ssi
@@ -12,7 +12,7 @@ Debian marea majoritate a acestor sisteme au urmatoarele dezavantaje:
_* Sunt proiecte neoficiale, dezvoltate in afara proiectului Debian.
-_* Ele amalgameaza diferite distributii, ca testing si unstable.
+_* They mix different distributions, e.g. *{testing}* and *{unstable}*.
_* Ele suporta doar arhitectura i386.
diff --git a/manual/ro/live-manual.ssm b/manual/ro/live-manual.ssm
index 92bd15d..69fbc1b 100644
--- a/manual/ro/live-manual.ssm
+++ b/manual/ro/live-manual.ssm
@@ -14,7 +14,7 @@
@publisher: Debian Live Project <debian-live at lists.debian.org>
@make:
- :bold: /Squeeze|squeeze|Stable|stable|Wheezy|wheezy|Testing|testing|Sid|sid|Unstable|unstable/
+ :bold: /Squeeze|squeeze|Wheezy|wheezy|Sid|sid/
:italics: /live-boot|live-build|live-config|live-magic|live-manual|live-installer|debian-installer-launcher/
:num_top: 1
:skin: skin_debian-live
diff --git a/manual/ro/project_bugs.ssi b/manual/ro/project_bugs.ssi
index 8443811..a2a2de3 100644
--- a/manual/ro/project_bugs.ssi
+++ b/manual/ro/project_bugs.ssi
@@ -21,12 +21,13 @@ used and the distribution of the live system you are building.
2~ Known issues
-Due to the nature of Debian testing and Debian unstable distributions being
-a moving target, building a live system may not always be possible.
+Due to the nature of Debian *{testing}* and Debian *{unstable}*
+distributions being a moving target, building a live system may not always
+be possible.
-If this is a problem, do not build a system based on testing or unstable,
-but go with stable. live-build does always default to the current stable
-release.
+If this is a problem, do not build a system based on *{testing}* or
+*{unstable}*, but go with *{stable}*. live-build does always default to the
+current *{stable}* release.
Currently known issues are listed under the section 'status' on our homepage
at http://live.debian.net/
@@ -34,8 +35,9 @@ at http://live.debian.net/
It is out of the scope of this manual to train you in correctly identifying
and fixing problems in packages of the development distributions, however,
there are two things you can always try: When not succeeding to build
-testing, try if unstable works. If unstable does not work either, revert to
-testing and pinning the newer version of the failing package from unstable.
+*{testing}*, try if *{unstable}* works. If *{unstable}* does not work
+either, revert to *{testing}* and pinning the newer version of the failing
+package from *{unstable}*.
2~ Rebuild from scratch
--
live-manual
More information about the debian-live-changes
mailing list