[SCM] live-manual branch, debian, updated. debian/3.0_a10-1-39-g216427c
chals
chals at altorricon.com
Tue Apr 3 07:21:44 UTC 2012
The following commit has been merged in the debian branch:
commit 7afef8b1dac85785d5763fe1fabe30062260736c
Author: chals <chals at altorricon.com>
Date: Sat Mar 31 16:29:32 2012 +0200
Adding some markup examples to the style guide.
diff --git a/manual/de/live-manual.ssm b/manual/de/live-manual.ssm
index 4edd8b7..c6b29a9 100644
--- a/manual/de/live-manual.ssm
+++ b/manual/de/live-manual.ssm
@@ -9,7 +9,7 @@
:license: Dieses Programm ist freie Software. Sie können es unter den Bedingungen der GNU General Public License, wie von der Free Software Foundation veröffentlicht, weitergeben und/oder modifizieren, entweder gemäss Version 3 der Lizenz oder (nach Ihrer Option) jeder späteren Version.<br><br>Die Veröffentlichung dieses Programms erfolgt in der Hoffnung, dass es Ihnen von Nutzen sein wird, aber OHNE IRGENDEINE GARANTIE, sogar ohne die implizite Garantie der MARKTREIFE oder der VERWENDBARKEIT FÜR EINEN BESTIMMTEN ZWECK. Details finden Sie in der GNU General Public License.<br><br>Sie sollten ein Exemplar der GNU General Public License zusammen mit diesem Programm erhalten haben. Falls nicht, siehe <http://www.gnu.org/licenses/>.<br><br>Der komplette Text der GNU General Public License kann in der Datei /usr/share/common-licenses/GPL-3 gefunden werden.
@date:
- :published: 2012-03-24
+ :published: 2012-03-31
@publisher: Debian Live Projekt <debian-live at lists.debian.org>
diff --git a/manual/de/style_guide.ssi b/manual/de/style_guide.ssi
index 3fe12c1..eae8bd9 100644
--- a/manual/de/style_guide.ssi
+++ b/manual/de/style_guide.ssi
@@ -176,15 +176,15 @@ copyrighted graphics or logos) that is published with it.
_* /{Write a first draft, revise, edit, improve, redo if necessary}/
-Brainstorm!. You need to organize your ideas first in a logical sequence of
-events.
+ - Brainstorm!. You need to organize your ideas first in a logical sequence
+ of events.
-Once you have somehow organized those ideas in your mind write a first
-draft.
+ - Once you have somehow organized those ideas in your mind write a first
+ draft.
-Revise grammar, syntax and spelling.
+ - Revise grammar, syntax and spelling.
-Improve your statements and redo any part if necessary.
+ - Improve your statements and redo any part if necessary.
_* /{Chapters}/
@@ -210,13 +210,50 @@ code{
}code
+Here are some markup examples that may prove useful:
+
+ - For emphasis/bold text:
+
+code{
+
+*{foo}* or !{foo}!
+
+}code
+
+produces: *{foo}* or !{foo}!. Use it to emphasize certain key words.
+
+ - For italics:
+
+code{
+
+/{foo}/
+
+}code
+
+produces: /{foo}/. Use them e.g. for the names of debian packages.
+
+ - For monospace:
+
+code{
+
+#{foo}#
+
+}code
+
+produces: #{foo}#. Use it e.g. for the names of commands. And also to
+highlight some key words or things like paths.
+
+ - For code blocks use #{code{}# to open and #{}code}# to close the tags. It
+ is important to remember to leave a space at the beginning of each line
+ of code.
+
2~ Guidelines for translators
This section deals with some general considerations to be taken into account
when translating the contents of live-manual.
As a general recommendation, translators should have read and understood the
-translation rules that apply to their specific languages. Usually
+translation rules that apply to their specific languages. Usually,
translation groups and mailing lists provide information on how to produce
translated work that complies with Debian quality standards.
@@ -264,8 +301,8 @@ _* /{Markup}/
Translators working initially with *{pot}* files and later on with *{po}*
files will find many markup features in the strings. They can translate the
-text anyway but it is extremely important that they use exactly the same
-markup as the original English version.
+text anyway, as long as it is translatable, but it is extremely important
+that they use exactly the same markup as the original English version.
_* /{Code blocks}/
@@ -286,10 +323,10 @@ want to make your translation easier to maintain.
_* /{New lines}/
-The translated texts need to have the exact same new lines (\n) as the
-original texts. Be careful to press the "Enter" key or type *{\n}* if they
-appear in the original files. These new lines often appear, for instance, in
-the code blocks.
+The translated texts need to have the exact same new lines as the original
+texts. Be careful to press the "Enter" key or type *{\n}* if they appear in
+the original files. These new lines often appear, for instance, in the code
+blocks.
Make no mistake, this does not mean that the translated text needs to have
the same length as the English version. That is nearly impossible.
@@ -298,16 +335,16 @@ _* /{Untranslatable strings}/
Translators should never translate:
- * The code names of releases
+ - The code names of releases
- * The names of programs
+ - The names of programs
- * The commands given as examples
+ - The commands given as examples
- * Metadata (often between colons *{:metadata:}*) especially the date in
- /{live-manual.ssm.po}/ because it changes every time live-manual is
- updated.
+ - Metadata (often between colons *{:metadata:}*) especially the date in
+ /{live-manual.ssm.po}/ because it changes every time live-manual is
+ updated.
- * Links
+ - Links
- * Paths
+ - Paths
diff --git a/manual/en/live-manual.ssm b/manual/en/live-manual.ssm
index 1fa12a4..96483b7 100644
--- a/manual/en/live-manual.ssm
+++ b/manual/en/live-manual.ssm
@@ -9,7 +9,7 @@
:license: This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.<br><br>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.<br><br>You should have received a copy of the GNU General Public License along with this program. If not, see http://www.gnu.org/licenses/. <br><br>The complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL-3 file.
@date:
- :published: 2012-03-24
+ :published: 2012-03-31
@publisher: Debian Live Project <debian-live at lists.debian.org>
diff --git a/manual/en/style_guide.ssi b/manual/en/style_guide.ssi
index 603f9b7..4e8ab89 100644
--- a/manual/en/style_guide.ssi
+++ b/manual/en/style_guide.ssi
@@ -102,13 +102,13 @@ live-manual is licensed under the GNU GPL. This has a number of implications tha
_* /{Write a first draft, revise, edit, improve, redo if necessary}/
-Brainstorm!. You need to organize your ideas first in a logical sequence of events.
+ - Brainstorm!. You need to organize your ideas first in a logical sequence of events.
-Once you have somehow organized those ideas in your mind write a first draft.
+ - Once you have somehow organized those ideas in your mind write a first draft.
-Revise grammar, syntax and spelling.
+ - Revise grammar, syntax and spelling.
-Improve your statements and redo any part if necessary.
+ - Improve your statements and redo any part if necessary.
_* /{Chapters}/
@@ -126,11 +126,45 @@ code{
}code
+Here are some markup examples that may prove useful:
+
+ - For emphasis/bold text:
+
+code{
+
+*{foo}* or !{foo}!
+
+}code
+
+produces: *{foo}* or !{foo}!. Use it to emphasize certain key words.
+
+ - For italics:
+
+code{
+
+/{foo}/
+
+}code
+
+produces: /{foo}/. Use them e.g. for the names of debian packages.
+
+ - For monospace:
+
+code{
+
+#{foo}#
+
+}code
+
+produces: #{foo}#. Use it e.g. for the names of commands. And also to highlight some key words or things like paths.
+
+ - For code blocks use #{code{}# to open and #{}code}# to close the tags. It is important to remember to leave a space at the beginning of each line of code.
+
2~ Guidelines for translators
This section deals with some general considerations to be taken into account when translating the contents of live-manual.
-As a general recommendation, translators should have read and understood the translation rules that apply to their specific languages. Usually translation groups and mailing lists provide information on how to produce translated work that complies with Debian quality standards.
+As a general recommendation, translators should have read and understood the translation rules that apply to their specific languages. Usually, translation groups and mailing lists provide information on how to produce translated work that complies with Debian quality standards.
*{Note:}* Translators should also read {Contributing to this document}#how-to-contribute. In particular the section {Translation}#translation
@@ -156,7 +190,7 @@ The trap of "false friends" explained before especially applies to translators.
_* /{Markup}/
-Translators working initially with *{pot}* files and later on with *{po}* files will find many markup features in the strings. They can translate the text anyway but it is extremely important that they use exactly the same markup as the original English version.
+Translators working initially with *{pot}* files and later on with *{po}* files will find many markup features in the strings. They can translate the text anyway, as long as it is translatable, but it is extremely important that they use exactly the same markup as the original English version.
_* /{Code blocks}/
@@ -170,7 +204,7 @@ Leave the code blocks empty (they will be automatically added then) if you want
_* /{New lines}/
-The translated texts need to have the exact same new lines (\n) as the original texts. Be careful to press the "Enter" key or type *{\n}* if they appear in the original files. These new lines often appear, for instance, in the code blocks.
+The translated texts need to have the exact same new lines as the original texts. Be careful to press the "Enter" key or type *{\n}* if they appear in the original files. These new lines often appear, for instance, in the code blocks.
Make no mistake, this does not mean that the translated text needs to have the same length as the English version. That is nearly impossible.
@@ -178,14 +212,14 @@ _* /{Untranslatable strings}/
Translators should never translate:
- * The code names of releases
+ - The code names of releases
- * The names of programs
+ - The names of programs
- * The commands given as examples
+ - The commands given as examples
- * Metadata (often between colons *{:metadata:}*) especially the date in /{live-manual.ssm.po}/ because it changes every time live-manual is updated.
+ - Metadata (often between colons *{:metadata:}*) especially the date in /{live-manual.ssm.po}/ because it changes every time live-manual is updated.
- * Links
+ - Links
- * Paths
+ - Paths
diff --git a/manual/es/live-manual.ssm b/manual/es/live-manual.ssm
index 6877545..1dba73d 100644
--- a/manual/es/live-manual.ssm
+++ b/manual/es/live-manual.ssm
@@ -9,7 +9,7 @@
:license: Este programa es software libre: puede ser redistribuido y/o modificado bajo los términos de la GNU General Public License publicada por la Free Software Foundation, bien de la versión 3 de la Licencia, o (a su elección) cualquier versión posterior. <br><br> Este programa se distribuye con la esperanza de que sea útil, pero SIN NINGUNA GARANTÍA, incluso sin la garantía implícita de COMERCIALIZACIÓN o IDONEIDAD PARA UN PROPÓSITO PARTICULAR. Consulte la GNU General Public License para más detalles. <br><br> Debería haber recibido una copia de la General Public License GNU junto con este programa. Si no, vea http://www.gnu.org/licenses/. <br><br> El texto completo de la GNU Licencia Pública General se pueden encontrar en /usr/share/common-licenses/GPL-3
@date:
- :published: 2012-03-24
+ :published: 2012-03-31
@publisher: Debian Live Project <debian-live at lists.debian.org>
diff --git a/manual/es/style_guide.ssi b/manual/es/style_guide.ssi
index d7fab7d..a0adaea 100644
--- a/manual/es/style_guide.ssi
+++ b/manual/es/style_guide.ssi
@@ -176,15 +176,15 @@ copyrighted graphics or logos) that is published with it.
_* /{Write a first draft, revise, edit, improve, redo if necessary}/
-Brainstorm!. You need to organize your ideas first in a logical sequence of
-events.
+ - Brainstorm!. You need to organize your ideas first in a logical sequence
+ of events.
-Once you have somehow organized those ideas in your mind write a first
-draft.
+ - Once you have somehow organized those ideas in your mind write a first
+ draft.
-Revise grammar, syntax and spelling.
+ - Revise grammar, syntax and spelling.
-Improve your statements and redo any part if necessary.
+ - Improve your statements and redo any part if necessary.
_* /{Chapters}/
@@ -210,13 +210,50 @@ code{
}code
+Here are some markup examples that may prove useful:
+
+ - For emphasis/bold text:
+
+code{
+
+*{foo}* or !{foo}!
+
+}code
+
+produces: *{foo}* or !{foo}!. Use it to emphasize certain key words.
+
+ - For italics:
+
+code{
+
+/{foo}/
+
+}code
+
+produces: /{foo}/. Use them e.g. for the names of debian packages.
+
+ - For monospace:
+
+code{
+
+#{foo}#
+
+}code
+
+produces: #{foo}#. Use it e.g. for the names of commands. And also to
+highlight some key words or things like paths.
+
+ - For code blocks use #{code{}# to open and #{}code}# to close the tags. It
+ is important to remember to leave a space at the beginning of each line
+ of code.
+
2~ Guidelines for translators
This section deals with some general considerations to be taken into account
when translating the contents of live-manual.
As a general recommendation, translators should have read and understood the
-translation rules that apply to their specific languages. Usually
+translation rules that apply to their specific languages. Usually,
translation groups and mailing lists provide information on how to produce
translated work that complies with Debian quality standards.
@@ -264,8 +301,8 @@ _* /{Markup}/
Translators working initially with *{pot}* files and later on with *{po}*
files will find many markup features in the strings. They can translate the
-text anyway but it is extremely important that they use exactly the same
-markup as the original English version.
+text anyway, as long as it is translatable, but it is extremely important
+that they use exactly the same markup as the original English version.
_* /{Code blocks}/
@@ -286,10 +323,10 @@ want to make your translation easier to maintain.
_* /{New lines}/
-The translated texts need to have the exact same new lines (\n) as the
-original texts. Be careful to press the "Enter" key or type *{\n}* if they
-appear in the original files. These new lines often appear, for instance, in
-the code blocks.
+The translated texts need to have the exact same new lines as the original
+texts. Be careful to press the "Enter" key or type *{\n}* if they appear in
+the original files. These new lines often appear, for instance, in the code
+blocks.
Make no mistake, this does not mean that the translated text needs to have
the same length as the English version. That is nearly impossible.
@@ -298,16 +335,16 @@ _* /{Untranslatable strings}/
Translators should never translate:
- * The code names of releases
+ - The code names of releases
- * The names of programs
+ - The names of programs
- * The commands given as examples
+ - The commands given as examples
- * Metadata (often between colons *{:metadata:}*) especially the date in
- /{live-manual.ssm.po}/ because it changes every time live-manual is
- updated.
+ - Metadata (often between colons *{:metadata:}*) especially the date in
+ /{live-manual.ssm.po}/ because it changes every time live-manual is
+ updated.
- * Links
+ - Links
- * Paths
+ - Paths
diff --git a/manual/fr/live-manual.ssm b/manual/fr/live-manual.ssm
index e7dc387..fc4801b 100644
--- a/manual/fr/live-manual.ssm
+++ b/manual/fr/live-manual.ssm
@@ -9,7 +9,7 @@
:license: Ce programme est un logiciel libre; vous pouvez le redistribuer ou le modifier suivant les termes de la Licence Générale Publique GNU telle que publiée par la Free Software Foundation: soit la version 3 de cette licence, soit (à votre gré) toute version ultérieure.<br><br>Ce programme est distribué dans l’espoir qu’il vous sera utile, mais SANS AUCUNE GARANTIE: sans même la garantie implicite de COMMERCIALISABILITÉ ni d’ADÉQUATION À UN OBJECTIF PARTICULIER. Consultez la Licence Générale Publique GNU pour plus de détails.<br><br>Vous devriez avoir reçu une copie de la Licence Générale Publique GNU avec ce programme ; si ce n’est pas le cas, consultez http://www.gnu.org/licenses/. <br><br>Le texte complet de la Licence Générale Publique GNU peut être trouvé dans le fichier / usr/share/common-licenses/GPL-3
@date:
- :published: 2012-03-24
+ :published: 2012-03-31
@publisher: Debian Live Project <debian-live at lists.debian.org>
diff --git a/manual/fr/style_guide.ssi b/manual/fr/style_guide.ssi
index 3fe12c1..eae8bd9 100644
--- a/manual/fr/style_guide.ssi
+++ b/manual/fr/style_guide.ssi
@@ -176,15 +176,15 @@ copyrighted graphics or logos) that is published with it.
_* /{Write a first draft, revise, edit, improve, redo if necessary}/
-Brainstorm!. You need to organize your ideas first in a logical sequence of
-events.
+ - Brainstorm!. You need to organize your ideas first in a logical sequence
+ of events.
-Once you have somehow organized those ideas in your mind write a first
-draft.
+ - Once you have somehow organized those ideas in your mind write a first
+ draft.
-Revise grammar, syntax and spelling.
+ - Revise grammar, syntax and spelling.
-Improve your statements and redo any part if necessary.
+ - Improve your statements and redo any part if necessary.
_* /{Chapters}/
@@ -210,13 +210,50 @@ code{
}code
+Here are some markup examples that may prove useful:
+
+ - For emphasis/bold text:
+
+code{
+
+*{foo}* or !{foo}!
+
+}code
+
+produces: *{foo}* or !{foo}!. Use it to emphasize certain key words.
+
+ - For italics:
+
+code{
+
+/{foo}/
+
+}code
+
+produces: /{foo}/. Use them e.g. for the names of debian packages.
+
+ - For monospace:
+
+code{
+
+#{foo}#
+
+}code
+
+produces: #{foo}#. Use it e.g. for the names of commands. And also to
+highlight some key words or things like paths.
+
+ - For code blocks use #{code{}# to open and #{}code}# to close the tags. It
+ is important to remember to leave a space at the beginning of each line
+ of code.
+
2~ Guidelines for translators
This section deals with some general considerations to be taken into account
when translating the contents of live-manual.
As a general recommendation, translators should have read and understood the
-translation rules that apply to their specific languages. Usually
+translation rules that apply to their specific languages. Usually,
translation groups and mailing lists provide information on how to produce
translated work that complies with Debian quality standards.
@@ -264,8 +301,8 @@ _* /{Markup}/
Translators working initially with *{pot}* files and later on with *{po}*
files will find many markup features in the strings. They can translate the
-text anyway but it is extremely important that they use exactly the same
-markup as the original English version.
+text anyway, as long as it is translatable, but it is extremely important
+that they use exactly the same markup as the original English version.
_* /{Code blocks}/
@@ -286,10 +323,10 @@ want to make your translation easier to maintain.
_* /{New lines}/
-The translated texts need to have the exact same new lines (\n) as the
-original texts. Be careful to press the "Enter" key or type *{\n}* if they
-appear in the original files. These new lines often appear, for instance, in
-the code blocks.
+The translated texts need to have the exact same new lines as the original
+texts. Be careful to press the "Enter" key or type *{\n}* if they appear in
+the original files. These new lines often appear, for instance, in the code
+blocks.
Make no mistake, this does not mean that the translated text needs to have
the same length as the English version. That is nearly impossible.
@@ -298,16 +335,16 @@ _* /{Untranslatable strings}/
Translators should never translate:
- * The code names of releases
+ - The code names of releases
- * The names of programs
+ - The names of programs
- * The commands given as examples
+ - The commands given as examples
- * Metadata (often between colons *{:metadata:}*) especially the date in
- /{live-manual.ssm.po}/ because it changes every time live-manual is
- updated.
+ - Metadata (often between colons *{:metadata:}*) especially the date in
+ /{live-manual.ssm.po}/ because it changes every time live-manual is
+ updated.
- * Links
+ - Links
- * Paths
+ - Paths
diff --git a/manual/it/live-manual.ssm b/manual/it/live-manual.ssm
index 67261bb..4aaac22 100644
--- a/manual/it/live-manual.ssm
+++ b/manual/it/live-manual.ssm
@@ -9,7 +9,7 @@
:license: Questo programma è software libero: è possibile ridistribuirlo e modificarlo secondo i termini della GNU General Public License come pubblicata dalla Free Software Foundation, sia la versione 3 della licenza o (a scelta) una versione successiva.<br><br>Questo programma è distribuito nella speranza che possa essere utile, ma SENZA ALCUNA GARANZIA, nemmeno la garanzia implicita di COMMERCIABILITÀ o IDONEITÀ PER UN PARTICOLARE SCOPO. Vedere la GNU General Public License per ulteriori dettagli.<br><br>Si dovrebbe aver ricevuto una copia della GNU General Public License con questo programma. In caso contrario, vedere http://www.gnu.org/licenses/. <br><br>Il testo completo della GNU General Public License può essere trovato nel file /usr/share/common-licenses/GPL-3.
@date:
- :published: 2012-03-24
+ :published: 2012-03-31
@publisher: Debian Live Project <debian-live at lists.debian.org>
diff --git a/manual/it/style_guide.ssi b/manual/it/style_guide.ssi
index 3fe12c1..eae8bd9 100644
--- a/manual/it/style_guide.ssi
+++ b/manual/it/style_guide.ssi
@@ -176,15 +176,15 @@ copyrighted graphics or logos) that is published with it.
_* /{Write a first draft, revise, edit, improve, redo if necessary}/
-Brainstorm!. You need to organize your ideas first in a logical sequence of
-events.
+ - Brainstorm!. You need to organize your ideas first in a logical sequence
+ of events.
-Once you have somehow organized those ideas in your mind write a first
-draft.
+ - Once you have somehow organized those ideas in your mind write a first
+ draft.
-Revise grammar, syntax and spelling.
+ - Revise grammar, syntax and spelling.
-Improve your statements and redo any part if necessary.
+ - Improve your statements and redo any part if necessary.
_* /{Chapters}/
@@ -210,13 +210,50 @@ code{
}code
+Here are some markup examples that may prove useful:
+
+ - For emphasis/bold text:
+
+code{
+
+*{foo}* or !{foo}!
+
+}code
+
+produces: *{foo}* or !{foo}!. Use it to emphasize certain key words.
+
+ - For italics:
+
+code{
+
+/{foo}/
+
+}code
+
+produces: /{foo}/. Use them e.g. for the names of debian packages.
+
+ - For monospace:
+
+code{
+
+#{foo}#
+
+}code
+
+produces: #{foo}#. Use it e.g. for the names of commands. And also to
+highlight some key words or things like paths.
+
+ - For code blocks use #{code{}# to open and #{}code}# to close the tags. It
+ is important to remember to leave a space at the beginning of each line
+ of code.
+
2~ Guidelines for translators
This section deals with some general considerations to be taken into account
when translating the contents of live-manual.
As a general recommendation, translators should have read and understood the
-translation rules that apply to their specific languages. Usually
+translation rules that apply to their specific languages. Usually,
translation groups and mailing lists provide information on how to produce
translated work that complies with Debian quality standards.
@@ -264,8 +301,8 @@ _* /{Markup}/
Translators working initially with *{pot}* files and later on with *{po}*
files will find many markup features in the strings. They can translate the
-text anyway but it is extremely important that they use exactly the same
-markup as the original English version.
+text anyway, as long as it is translatable, but it is extremely important
+that they use exactly the same markup as the original English version.
_* /{Code blocks}/
@@ -286,10 +323,10 @@ want to make your translation easier to maintain.
_* /{New lines}/
-The translated texts need to have the exact same new lines (\n) as the
-original texts. Be careful to press the "Enter" key or type *{\n}* if they
-appear in the original files. These new lines often appear, for instance, in
-the code blocks.
+The translated texts need to have the exact same new lines as the original
+texts. Be careful to press the "Enter" key or type *{\n}* if they appear in
+the original files. These new lines often appear, for instance, in the code
+blocks.
Make no mistake, this does not mean that the translated text needs to have
the same length as the English version. That is nearly impossible.
@@ -298,16 +335,16 @@ _* /{Untranslatable strings}/
Translators should never translate:
- * The code names of releases
+ - The code names of releases
- * The names of programs
+ - The names of programs
- * The commands given as examples
+ - The commands given as examples
- * Metadata (often between colons *{:metadata:}*) especially the date in
- /{live-manual.ssm.po}/ because it changes every time live-manual is
- updated.
+ - Metadata (often between colons *{:metadata:}*) especially the date in
+ /{live-manual.ssm.po}/ because it changes every time live-manual is
+ updated.
- * Links
+ - Links
- * Paths
+ - Paths
diff --git a/manual/po/de/live-manual.ssm.po b/manual/po/de/live-manual.ssm.po
index 4123ac2..1643c9e 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: 2012-03-24 11:45+0100\n"
+"POT-Creation-Date: 2012-03-31 16:26+0300\n"
"PO-Revision-Date: 2011-04-23 14:15+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -48,7 +48,7 @@ msgstr ""
#, no-wrap
msgid ""
"@date:\n"
-" :published: 2012-03-24\n"
+" :published: 2012-03-31\n"
msgstr ""
#. type: Plain text
diff --git a/manual/po/de/style_guide.ssi.po b/manual/po/de/style_guide.ssi.po
index b306dbc..4926c85 100644
--- a/manual/po/de/style_guide.ssi.po
+++ b/manual/po/de/style_guide.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-02-11 16:42+0100\n"
+"POT-Creation-Date: 2012-03-31 16:26+0300\n"
"PO-Revision-Date: 2012-02-11 16:42+0100\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -32,7 +32,8 @@ msgstr ""
#: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/style_guide.ssi:124 en/user_basics.ssi:32
+#: en/project_procedures.ssi:58 en/style_guide.ssi:124 en/style_guide.ssi:134
+#: en/style_guide.ssi:144 en/style_guide.ssi:154 en/user_basics.ssi:32
#: en/user_basics.ssi:42 en/user_basics.ssi:58 en/user_basics.ssi:73
#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:128
#: en/user_basics.ssi:140 en/user_basics.ssi:152 en/user_basics.ssi:160
@@ -40,10 +41,10 @@ msgstr ""
#: en/user_basics.ssi:202 en/user_basics.ssi:218 en/user_basics.ssi:226
#: en/user_basics.ssi:236 en/user_basics.ssi:254 en/user_basics.ssi:282
#: en/user_basics.ssi:298 en/user_basics.ssi:306 en/user_basics.ssi:326
-#: en/user_basics.ssi:351 en/user_customization-binary.ssi:16
-#: en/user_customization-binary.ssi:27 en/user_customization-contents.ssi:26
-#: en/user_customization-contents.ssi:35 en/user_customization-contents.ssi:54
-#: en/user_customization-contents.ssi:66
+#: en/user_basics.ssi:351 en/user_customization-binary.ssi:14
+#: en/user_customization-binary.ssi:28 en/user_customization-binary.ssi:39
+#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
+#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
@@ -67,25 +68,26 @@ msgstr ""
#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
#: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
-#: en/user_customization-runtime.ssi:104 en/user_customization-runtime.ssi:114
-#: en/user_customization-runtime.ssi:122 en/user_examples.ssi:14
-#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
-#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
-#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
-#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
-#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
-#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
-#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
-#: en/user_examples.ssi:277 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:74
-#: en/user_installation.ssi:82 en/user_installation.ssi:90
-#: en/user_installation.ssi:114 en/user_installation.ssi:129
-#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
+#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
+#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:67 en/user_examples.ssi:83
+#: en/user_examples.ssi:93 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:127 en/user_examples.ssi:141 en/user_examples.ssi:149
+#: en/user_examples.ssi:157 en/user_examples.ssi:165 en/user_examples.ssi:181
+#: en/user_examples.ssi:193 en/user_examples.ssi:209 en/user_examples.ssi:223
+#: en/user_examples.ssi:232 en/user_examples.ssi:250 en/user_examples.ssi:258
+#: en/user_examples.ssi:267 en/user_examples.ssi:277
+#: en/user_installation.ssi:38 en/user_installation.ssi:46
+#: en/user_installation.ssi:56 en/user_installation.ssi:64
+#: en/user_installation.ssi:74 en/user_installation.ssi:82
+#: en/user_installation.ssi:90 en/user_installation.ssi:114
+#: en/user_installation.ssi:129 en/user_installation.ssi:146
+#: en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
-#: en/user_overview.ssi:48 en/user_overview.ssi:56
+#: en/user_overview.ssi:49 en/user_overview.ssi:57
msgid "code{"
msgstr ""
@@ -100,7 +102,8 @@ msgstr ""
#: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/style_guide.ssi:128 en/user_basics.ssi:36
+#: en/project_procedures.ssi:131 en/style_guide.ssi:128 en/style_guide.ssi:138
+#: en/style_guide.ssi:148 en/style_guide.ssi:158 en/user_basics.ssi:36
#: en/user_basics.ssi:46 en/user_basics.ssi:64 en/user_basics.ssi:77
#: en/user_basics.ssi:112 en/user_basics.ssi:120 en/user_basics.ssi:134
#: en/user_basics.ssi:144 en/user_basics.ssi:156 en/user_basics.ssi:164
@@ -108,10 +111,10 @@ msgstr ""
#: en/user_basics.ssi:206 en/user_basics.ssi:222 en/user_basics.ssi:230
#: en/user_basics.ssi:240 en/user_basics.ssi:274 en/user_basics.ssi:286
#: en/user_basics.ssi:302 en/user_basics.ssi:310 en/user_basics.ssi:337
-#: en/user_basics.ssi:376 en/user_customization-binary.ssi:23
-#: en/user_customization-binary.ssi:33 en/user_customization-contents.ssi:31
-#: en/user_customization-contents.ssi:46 en/user_customization-contents.ssi:58
-#: en/user_customization-contents.ssi:70
+#: en/user_basics.ssi:376 en/user_customization-binary.ssi:18
+#: en/user_customization-binary.ssi:35 en/user_customization-binary.ssi:45
+#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
+#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
#: en/user_customization-installer.ssi:38
#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
@@ -135,25 +138,26 @@ msgstr ""
#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
#: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
#: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
-#: en/user_customization-runtime.ssi:108 en/user_customization-runtime.ssi:118
-#: en/user_customization-runtime.ssi:127 en/user_examples.ssi:20
-#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
-#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
-#: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
-#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
-#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
-#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
-#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
-#: en/user_examples.ssi:291 en/user_installation.ssi:42
-#: en/user_installation.ssi:50 en/user_installation.ssi:60
-#: en/user_installation.ssi:70 en/user_installation.ssi:78
-#: en/user_installation.ssi:86 en/user_installation.ssi:94
-#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
+#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
+#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:61 en/user_examples.ssi:71 en/user_examples.ssi:89
+#: en/user_examples.ssi:103 en/user_examples.ssi:111 en/user_examples.ssi:121
+#: en/user_examples.ssi:133 en/user_examples.ssi:145 en/user_examples.ssi:153
+#: en/user_examples.ssi:161 en/user_examples.ssi:169 en/user_examples.ssi:189
+#: en/user_examples.ssi:205 en/user_examples.ssi:213 en/user_examples.ssi:228
+#: en/user_examples.ssi:236 en/user_examples.ssi:254 en/user_examples.ssi:263
+#: en/user_examples.ssi:273 en/user_examples.ssi:291
+#: en/user_installation.ssi:42 en/user_installation.ssi:50
+#: en/user_installation.ssi:60 en/user_installation.ssi:70
+#: en/user_installation.ssi:78 en/user_installation.ssi:86
+#: en/user_installation.ssi:94 en/user_installation.ssi:119
+#: en/user_installation.ssi:136 en/user_installation.ssi:149
+#: en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
-#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:42
-#: en/user_overview.ssi:52 en/user_overview.ssi:60
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:43
+#: en/user_overview.ssi:53 en/user_overview.ssi:61
msgid "}code"
msgstr ""
@@ -517,25 +521,25 @@ msgstr ""
msgid "_* /{Write a first draft, revise, edit, improve, redo if necessary}/"
msgstr ""
-#. type: Plain text
+#. type: Bullet: ' - '
#: en/style_guide.ssi:106
msgid ""
"Brainstorm!. You need to organize your ideas first in a logical sequence of "
"events."
msgstr ""
-#. type: Plain text
+#. type: Bullet: ' - '
#: en/style_guide.ssi:108
msgid ""
"Once you have somehow organized those ideas in your mind write a first draft."
msgstr ""
-#. type: Plain text
+#. type: Bullet: ' - '
#: en/style_guide.ssi:110
msgid "Revise grammar, syntax and spelling."
msgstr ""
-#. type: Plain text
+#. type: Bullet: ' - '
#: en/style_guide.ssi:112
msgid "Improve your statements and redo any part if necessary."
msgstr ""
@@ -562,7 +566,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:120 en/style_guide.ssi:158
+#: en/style_guide.ssi:120 en/style_guide.ssi:192
msgid "_* /{Markup}/"
msgstr ""
@@ -583,43 +587,103 @@ msgstr ""
#. type: Plain text
#: en/style_guide.ssi:130
+msgid "Here are some markup examples that may prove useful:"
+msgstr ""
+
+#. type: Bullet: ' - '
+#: en/style_guide.ssi:132
+msgid "For emphasis/bold text:"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:136
+#, no-wrap
+msgid "*{foo}* or !{foo}!\n"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:140
+msgid "produces: *{foo}* or !{foo}!. Use it to emphasize certain key words."
+msgstr ""
+
+#. type: Bullet: ' - '
+#: en/style_guide.ssi:142
+msgid "For italics:"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:146
+msgid "/{foo}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:150
+msgid "produces: /{foo}/. Use them e.g. for the names of debian packages."
+msgstr ""
+
+#. type: Bullet: ' - '
+#: en/style_guide.ssi:152
+msgid "For monospace:"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:156
+msgid "#{foo}#"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:160
+msgid ""
+"produces: #{foo}#. Use it e.g. for the names of commands. And also to "
+"highlight some key words or things like paths."
+msgstr ""
+
+#. type: Bullet: ' - '
+#: en/style_guide.ssi:162
+msgid ""
+"For code blocks use #{code{}# to open and #{}code}# to close the tags. It is "
+"important to remember to leave a space at the beginning of each line of code."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:164
msgid "2~ Guidelines for translators"
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:132
+#: en/style_guide.ssi:166
msgid ""
"This section deals with some general considerations to be taken into account "
"when translating the contents of live-manual."
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:134
+#: en/style_guide.ssi:168
msgid ""
"As a general recommendation, translators should have read and understood the "
-"translation rules that apply to their specific languages. Usually "
+"translation rules that apply to their specific languages. Usually, "
"translation groups and mailing lists provide information on how to produce "
"translated work that complies with Debian quality standards."
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:136
+#: en/style_guide.ssi:170
#, no-wrap
msgid "*{Note:}* Translators should also read {Contributing to this document}#how-to-contribute. In particular the section {Translation}#translation\n"
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:138
+#: en/style_guide.ssi:172
msgid "3~ Translation hints"
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:140
+#: en/style_guide.ssi:174
msgid "_* /{Comments}/"
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:142
+#: en/style_guide.ssi:176
msgid ""
"The role of the translator is to convey as faithfully as possible the "
"meaning of words, sentences, paragraphs and texts as written by the original "
@@ -627,7 +691,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:144
+#: en/style_guide.ssi:178
msgid ""
"So they should refrain from adding personal comments or extra bits of "
"information of their own. If they want to add a comment for other "
@@ -638,12 +702,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:146
+#: en/style_guide.ssi:180
msgid "_* /{TN, Translator's Note}/"
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:148
+#: en/style_guide.ssi:182
msgid ""
"It is perfectly acceptable however, to include a word or an expression in "
"brackets in the translated text if, and only if, that makes the meaning of a "
@@ -653,12 +717,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:150
+#: en/style_guide.ssi:184
msgid "_* /{Impersonal sentences}/"
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:152
+#: en/style_guide.ssi:186
msgid ""
"Documents written in English make an extensive use of the impersonal form "
"\"you\". In some other languages that do not share this characteristic, this "
@@ -669,12 +733,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:154
+#: en/style_guide.ssi:188
msgid "_* /{False friends}/"
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:156
+#: en/style_guide.ssi:190
msgid ""
"The trap of \"false friends\" explained before especially applies to "
"translators. Double check the meaning of suspicious false friends if in "
@@ -682,21 +746,21 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:160
+#: en/style_guide.ssi:194
msgid ""
"Translators working initially with *{pot}* files and later on with *{po}* "
"files will find many markup features in the strings. They can translate the "
-"text anyway but it is extremely important that they use exactly the same "
-"markup as the original English version."
+"text anyway, as long as it is translatable, but it is extremely important "
+"that they use exactly the same markup as the original English version."
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:162
+#: en/style_guide.ssi:196
msgid "_* /{Code blocks}/"
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:164
+#: en/style_guide.ssi:198
msgid ""
"Some translators decide to include the code blocks in the translated files "
"because it is easier for them to identify what has already been translated "
@@ -705,13 +769,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:166
+#: en/style_guide.ssi:200
msgid ""
"Include the code blocks if you want to score a 100% complete translation."
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:168
+#: en/style_guide.ssi:202
msgid ""
"On the other hand some translators prefer to leave the code blocks "
"\"untranslated\" (i.e. not including them). This makes the translation "
@@ -720,71 +784,71 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:170
+#: en/style_guide.ssi:204
msgid ""
"Leave the code blocks empty (they will be automatically added then) if you "
"want to make your translation easier to maintain."
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:172
+#: en/style_guide.ssi:206
msgid "_* /{New lines}/"
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:174
+#: en/style_guide.ssi:208
msgid ""
-"The translated texts need to have the exact same new lines (\\n) as the "
-"original texts. Be careful to press the \"Enter\" key or type *{\\n}* if "
-"they appear in the original files. These new lines often appear, for "
-"instance, in the code blocks."
+"The translated texts need to have the exact same new lines as the original "
+"texts. Be careful to press the \"Enter\" key or type *{\\n}* if they appear "
+"in the original files. These new lines often appear, for instance, in the "
+"code blocks."
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:176
+#: en/style_guide.ssi:210
msgid ""
"Make no mistake, this does not mean that the translated text needs to have "
"the same length as the English version. That is nearly impossible."
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:178
+#: en/style_guide.ssi:212
msgid "_* /{Untranslatable strings}/"
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:180
+#: en/style_guide.ssi:214
msgid "Translators should never translate:"
msgstr ""
-#. type: Bullet: ' * '
-#: en/style_guide.ssi:182
+#. type: Bullet: ' - '
+#: en/style_guide.ssi:216
msgid "The code names of releases"
msgstr ""
-#. type: Bullet: ' * '
-#: en/style_guide.ssi:184
+#. type: Bullet: ' - '
+#: en/style_guide.ssi:218
msgid "The names of programs"
msgstr ""
-#. type: Bullet: ' * '
-#: en/style_guide.ssi:186
+#. type: Bullet: ' - '
+#: en/style_guide.ssi:220
msgid "The commands given as examples"
msgstr ""
-#. type: Bullet: ' * '
-#: en/style_guide.ssi:188
+#. type: Bullet: ' - '
+#: en/style_guide.ssi:222
msgid ""
"Metadata (often between colons *{:metadata:}*) especially the date in /{live-"
"manual.ssm.po}/ because it changes every time live-manual is updated."
msgstr ""
-#. type: Bullet: ' * '
-#: en/style_guide.ssi:190
+#. type: Bullet: ' - '
+#: en/style_guide.ssi:224
msgid "Links"
msgstr ""
-#. type: Bullet: ' * '
-#: en/style_guide.ssi:191
+#. type: Bullet: ' - '
+#: en/style_guide.ssi:225
msgid "Paths"
msgstr ""
diff --git a/manual/po/es/live-manual.ssm.po b/manual/po/es/live-manual.ssm.po
index ce50851..5c46038 100644
--- a/manual/po/es/live-manual.ssm.po
+++ b/manual/po/es/live-manual.ssm.po
@@ -9,7 +9,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-03-24 11:45+0100\n"
+"POT-Creation-Date: 2012-03-31 16:26+0300\n"
"PO-Revision-Date: 2011-03-12 08:00-0000\n"
"Last-Translator: José Luis Zabalza and Carlos Zuferri «chals» "
"<jlz.3008 at gmail.com> <chals at altorricon.com\n"
@@ -53,7 +53,7 @@ msgstr ""
#, no-wrap
msgid ""
"@date:\n"
-" :published: 2012-03-24\n"
+" :published: 2012-03-31\n"
msgstr ""
#. type: Plain text
diff --git a/manual/po/es/style_guide.ssi.po b/manual/po/es/style_guide.ssi.po
index ee56e8e..b0b3843 100644
--- a/manual/po/es/style_guide.ssi.po
+++ b/manual/po/es/style_guide.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-02-11 16:42+0100\n"
+"POT-Creation-Date: 2012-03-31 16:26+0300\n"
"PO-Revision-Date: 2012-02-11 16:42+0100\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -32,7 +32,8 @@ msgstr ":B~ Apéndice"
#: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/style_guide.ssi:124 en/user_basics.ssi:32
+#: en/project_procedures.ssi:58 en/style_guide.ssi:124 en/style_guide.ssi:134
+#: en/style_guide.ssi:144 en/style_guide.ssi:154 en/user_basics.ssi:32
#: en/user_basics.ssi:42 en/user_basics.ssi:58 en/user_basics.ssi:73
#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:128
#: en/user_basics.ssi:140 en/user_basics.ssi:152 en/user_basics.ssi:160
@@ -40,10 +41,10 @@ msgstr ":B~ Apéndice"
#: en/user_basics.ssi:202 en/user_basics.ssi:218 en/user_basics.ssi:226
#: en/user_basics.ssi:236 en/user_basics.ssi:254 en/user_basics.ssi:282
#: en/user_basics.ssi:298 en/user_basics.ssi:306 en/user_basics.ssi:326
-#: en/user_basics.ssi:351 en/user_customization-binary.ssi:16
-#: en/user_customization-binary.ssi:27 en/user_customization-contents.ssi:26
-#: en/user_customization-contents.ssi:35 en/user_customization-contents.ssi:54
-#: en/user_customization-contents.ssi:66
+#: en/user_basics.ssi:351 en/user_customization-binary.ssi:14
+#: en/user_customization-binary.ssi:28 en/user_customization-binary.ssi:39
+#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
+#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
@@ -67,25 +68,26 @@ msgstr ":B~ Apéndice"
#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
#: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
-#: en/user_customization-runtime.ssi:104 en/user_customization-runtime.ssi:114
-#: en/user_customization-runtime.ssi:122 en/user_examples.ssi:14
-#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
-#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
-#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
-#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
-#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
-#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
-#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
-#: en/user_examples.ssi:277 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:74
-#: en/user_installation.ssi:82 en/user_installation.ssi:90
-#: en/user_installation.ssi:114 en/user_installation.ssi:129
-#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
+#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
+#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:67 en/user_examples.ssi:83
+#: en/user_examples.ssi:93 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:127 en/user_examples.ssi:141 en/user_examples.ssi:149
+#: en/user_examples.ssi:157 en/user_examples.ssi:165 en/user_examples.ssi:181
+#: en/user_examples.ssi:193 en/user_examples.ssi:209 en/user_examples.ssi:223
+#: en/user_examples.ssi:232 en/user_examples.ssi:250 en/user_examples.ssi:258
+#: en/user_examples.ssi:267 en/user_examples.ssi:277
+#: en/user_installation.ssi:38 en/user_installation.ssi:46
+#: en/user_installation.ssi:56 en/user_installation.ssi:64
+#: en/user_installation.ssi:74 en/user_installation.ssi:82
+#: en/user_installation.ssi:90 en/user_installation.ssi:114
+#: en/user_installation.ssi:129 en/user_installation.ssi:146
+#: en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
-#: en/user_overview.ssi:48 en/user_overview.ssi:56
+#: en/user_overview.ssi:49 en/user_overview.ssi:57
msgid "code{"
msgstr "code{"
@@ -100,7 +102,8 @@ msgstr "code{"
#: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/style_guide.ssi:128 en/user_basics.ssi:36
+#: en/project_procedures.ssi:131 en/style_guide.ssi:128 en/style_guide.ssi:138
+#: en/style_guide.ssi:148 en/style_guide.ssi:158 en/user_basics.ssi:36
#: en/user_basics.ssi:46 en/user_basics.ssi:64 en/user_basics.ssi:77
#: en/user_basics.ssi:112 en/user_basics.ssi:120 en/user_basics.ssi:134
#: en/user_basics.ssi:144 en/user_basics.ssi:156 en/user_basics.ssi:164
@@ -108,10 +111,10 @@ msgstr "code{"
#: en/user_basics.ssi:206 en/user_basics.ssi:222 en/user_basics.ssi:230
#: en/user_basics.ssi:240 en/user_basics.ssi:274 en/user_basics.ssi:286
#: en/user_basics.ssi:302 en/user_basics.ssi:310 en/user_basics.ssi:337
-#: en/user_basics.ssi:376 en/user_customization-binary.ssi:23
-#: en/user_customization-binary.ssi:33 en/user_customization-contents.ssi:31
-#: en/user_customization-contents.ssi:46 en/user_customization-contents.ssi:58
-#: en/user_customization-contents.ssi:70
+#: en/user_basics.ssi:376 en/user_customization-binary.ssi:18
+#: en/user_customization-binary.ssi:35 en/user_customization-binary.ssi:45
+#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
+#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
#: en/user_customization-installer.ssi:38
#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
@@ -135,25 +138,26 @@ msgstr "code{"
#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
#: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
#: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
-#: en/user_customization-runtime.ssi:108 en/user_customization-runtime.ssi:118
-#: en/user_customization-runtime.ssi:127 en/user_examples.ssi:20
-#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
-#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
-#: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
-#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
-#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
-#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
-#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
-#: en/user_examples.ssi:291 en/user_installation.ssi:42
-#: en/user_installation.ssi:50 en/user_installation.ssi:60
-#: en/user_installation.ssi:70 en/user_installation.ssi:78
-#: en/user_installation.ssi:86 en/user_installation.ssi:94
-#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
+#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
+#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:61 en/user_examples.ssi:71 en/user_examples.ssi:89
+#: en/user_examples.ssi:103 en/user_examples.ssi:111 en/user_examples.ssi:121
+#: en/user_examples.ssi:133 en/user_examples.ssi:145 en/user_examples.ssi:153
+#: en/user_examples.ssi:161 en/user_examples.ssi:169 en/user_examples.ssi:189
+#: en/user_examples.ssi:205 en/user_examples.ssi:213 en/user_examples.ssi:228
+#: en/user_examples.ssi:236 en/user_examples.ssi:254 en/user_examples.ssi:263
+#: en/user_examples.ssi:273 en/user_examples.ssi:291
+#: en/user_installation.ssi:42 en/user_installation.ssi:50
+#: en/user_installation.ssi:60 en/user_installation.ssi:70
+#: en/user_installation.ssi:78 en/user_installation.ssi:86
+#: en/user_installation.ssi:94 en/user_installation.ssi:119
+#: en/user_installation.ssi:136 en/user_installation.ssi:149
+#: en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
-#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:42
-#: en/user_overview.ssi:52 en/user_overview.ssi:60
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:43
+#: en/user_overview.ssi:53 en/user_overview.ssi:61
msgid "}code"
msgstr "}code"
@@ -517,25 +521,25 @@ msgstr ""
msgid "_* /{Write a first draft, revise, edit, improve, redo if necessary}/"
msgstr ""
-#. type: Plain text
+#. type: Bullet: ' - '
#: en/style_guide.ssi:106
msgid ""
"Brainstorm!. You need to organize your ideas first in a logical sequence of "
"events."
msgstr ""
-#. type: Plain text
+#. type: Bullet: ' - '
#: en/style_guide.ssi:108
msgid ""
"Once you have somehow organized those ideas in your mind write a first draft."
msgstr ""
-#. type: Plain text
+#. type: Bullet: ' - '
#: en/style_guide.ssi:110
msgid "Revise grammar, syntax and spelling."
msgstr ""
-#. type: Plain text
+#. type: Bullet: ' - '
#: en/style_guide.ssi:112
msgid "Improve your statements and redo any part if necessary."
msgstr ""
@@ -562,7 +566,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:120 en/style_guide.ssi:158
+#: en/style_guide.ssi:120 en/style_guide.ssi:192
msgid "_* /{Markup}/"
msgstr ""
@@ -583,43 +587,103 @@ msgstr ""
#. type: Plain text
#: en/style_guide.ssi:130
+msgid "Here are some markup examples that may prove useful:"
+msgstr ""
+
+#. type: Bullet: ' - '
+#: en/style_guide.ssi:132
+msgid "For emphasis/bold text:"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:136
+#, no-wrap
+msgid "*{foo}* or !{foo}!\n"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:140
+msgid "produces: *{foo}* or !{foo}!. Use it to emphasize certain key words."
+msgstr ""
+
+#. type: Bullet: ' - '
+#: en/style_guide.ssi:142
+msgid "For italics:"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:146
+msgid "/{foo}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:150
+msgid "produces: /{foo}/. Use them e.g. for the names of debian packages."
+msgstr ""
+
+#. type: Bullet: ' - '
+#: en/style_guide.ssi:152
+msgid "For monospace:"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:156
+msgid "#{foo}#"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:160
+msgid ""
+"produces: #{foo}#. Use it e.g. for the names of commands. And also to "
+"highlight some key words or things like paths."
+msgstr ""
+
+#. type: Bullet: ' - '
+#: en/style_guide.ssi:162
+msgid ""
+"For code blocks use #{code{}# to open and #{}code}# to close the tags. It is "
+"important to remember to leave a space at the beginning of each line of code."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:164
msgid "2~ Guidelines for translators"
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:132
+#: en/style_guide.ssi:166
msgid ""
"This section deals with some general considerations to be taken into account "
"when translating the contents of live-manual."
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:134
+#: en/style_guide.ssi:168
msgid ""
"As a general recommendation, translators should have read and understood the "
-"translation rules that apply to their specific languages. Usually "
+"translation rules that apply to their specific languages. Usually, "
"translation groups and mailing lists provide information on how to produce "
"translated work that complies with Debian quality standards."
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:136
+#: en/style_guide.ssi:170
#, no-wrap
msgid "*{Note:}* Translators should also read {Contributing to this document}#how-to-contribute. In particular the section {Translation}#translation\n"
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:138
+#: en/style_guide.ssi:172
msgid "3~ Translation hints"
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:140
+#: en/style_guide.ssi:174
msgid "_* /{Comments}/"
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:142
+#: en/style_guide.ssi:176
msgid ""
"The role of the translator is to convey as faithfully as possible the "
"meaning of words, sentences, paragraphs and texts as written by the original "
@@ -627,7 +691,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:144
+#: en/style_guide.ssi:178
msgid ""
"So they should refrain from adding personal comments or extra bits of "
"information of their own. If they want to add a comment for other "
@@ -638,12 +702,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:146
+#: en/style_guide.ssi:180
msgid "_* /{TN, Translator's Note}/"
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:148
+#: en/style_guide.ssi:182
msgid ""
"It is perfectly acceptable however, to include a word or an expression in "
"brackets in the translated text if, and only if, that makes the meaning of a "
@@ -653,12 +717,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:150
+#: en/style_guide.ssi:184
msgid "_* /{Impersonal sentences}/"
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:152
+#: en/style_guide.ssi:186
msgid ""
"Documents written in English make an extensive use of the impersonal form "
"\"you\". In some other languages that do not share this characteristic, this "
@@ -669,12 +733,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:154
+#: en/style_guide.ssi:188
msgid "_* /{False friends}/"
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:156
+#: en/style_guide.ssi:190
msgid ""
"The trap of \"false friends\" explained before especially applies to "
"translators. Double check the meaning of suspicious false friends if in "
@@ -682,21 +746,21 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:160
+#: en/style_guide.ssi:194
msgid ""
"Translators working initially with *{pot}* files and later on with *{po}* "
"files will find many markup features in the strings. They can translate the "
-"text anyway but it is extremely important that they use exactly the same "
-"markup as the original English version."
+"text anyway, as long as it is translatable, but it is extremely important "
+"that they use exactly the same markup as the original English version."
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:162
+#: en/style_guide.ssi:196
msgid "_* /{Code blocks}/"
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:164
+#: en/style_guide.ssi:198
msgid ""
"Some translators decide to include the code blocks in the translated files "
"because it is easier for them to identify what has already been translated "
@@ -705,13 +769,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:166
+#: en/style_guide.ssi:200
msgid ""
"Include the code blocks if you want to score a 100% complete translation."
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:168
+#: en/style_guide.ssi:202
msgid ""
"On the other hand some translators prefer to leave the code blocks "
"\"untranslated\" (i.e. not including them). This makes the translation "
@@ -720,71 +784,71 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:170
+#: en/style_guide.ssi:204
msgid ""
"Leave the code blocks empty (they will be automatically added then) if you "
"want to make your translation easier to maintain."
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:172
+#: en/style_guide.ssi:206
msgid "_* /{New lines}/"
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:174
+#: en/style_guide.ssi:208
msgid ""
-"The translated texts need to have the exact same new lines (\\n) as the "
-"original texts. Be careful to press the \"Enter\" key or type *{\\n}* if "
-"they appear in the original files. These new lines often appear, for "
-"instance, in the code blocks."
+"The translated texts need to have the exact same new lines as the original "
+"texts. Be careful to press the \"Enter\" key or type *{\\n}* if they appear "
+"in the original files. These new lines often appear, for instance, in the "
+"code blocks."
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:176
+#: en/style_guide.ssi:210
msgid ""
"Make no mistake, this does not mean that the translated text needs to have "
"the same length as the English version. That is nearly impossible."
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:178
+#: en/style_guide.ssi:212
msgid "_* /{Untranslatable strings}/"
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:180
+#: en/style_guide.ssi:214
msgid "Translators should never translate:"
msgstr ""
-#. type: Bullet: ' * '
-#: en/style_guide.ssi:182
+#. type: Bullet: ' - '
+#: en/style_guide.ssi:216
msgid "The code names of releases"
msgstr ""
-#. type: Bullet: ' * '
-#: en/style_guide.ssi:184
+#. type: Bullet: ' - '
+#: en/style_guide.ssi:218
msgid "The names of programs"
msgstr ""
-#. type: Bullet: ' * '
-#: en/style_guide.ssi:186
+#. type: Bullet: ' - '
+#: en/style_guide.ssi:220
msgid "The commands given as examples"
msgstr ""
-#. type: Bullet: ' * '
-#: en/style_guide.ssi:188
+#. type: Bullet: ' - '
+#: en/style_guide.ssi:222
msgid ""
"Metadata (often between colons *{:metadata:}*) especially the date in /{live-"
"manual.ssm.po}/ because it changes every time live-manual is updated."
msgstr ""
-#. type: Bullet: ' * '
-#: en/style_guide.ssi:190
+#. type: Bullet: ' - '
+#: en/style_guide.ssi:224
msgid "Links"
msgstr ""
-#. type: Bullet: ' * '
-#: en/style_guide.ssi:191
+#. type: Bullet: ' - '
+#: en/style_guide.ssi:225
msgid "Paths"
msgstr ""
diff --git a/manual/po/fr/live-manual.ssm.po b/manual/po/fr/live-manual.ssm.po
index d85fe35..fd3a167 100644
--- a/manual/po/fr/live-manual.ssm.po
+++ b/manual/po/fr/live-manual.ssm.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2012-03-24 11:45+0100\n"
+"POT-Creation-Date: 2012-03-31 16:26+0300\n"
"PO-Revision-Date: 2011-06-19 16:32+0200\n"
"Last-Translator: Carlos Zuferri «chals» <chals at altorricon.com>\n"
"Language-Team: <debian-live at lists.debian.org>\n"
@@ -49,7 +49,7 @@ msgstr ""
#, no-wrap
msgid ""
"@date:\n"
-" :published: 2012-03-24\n"
+" :published: 2012-03-31\n"
msgstr ""
#. type: Plain text
diff --git a/manual/po/fr/style_guide.ssi.po b/manual/po/fr/style_guide.ssi.po
index 33a7976..0905465 100644
--- a/manual/po/fr/style_guide.ssi.po
+++ b/manual/po/fr/style_guide.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-02-11 16:42+0100\n"
+"POT-Creation-Date: 2012-03-31 16:26+0300\n"
"PO-Revision-Date: 2012-02-11 16:42+0100\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -32,7 +32,8 @@ msgstr ""
#: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/style_guide.ssi:124 en/user_basics.ssi:32
+#: en/project_procedures.ssi:58 en/style_guide.ssi:124 en/style_guide.ssi:134
+#: en/style_guide.ssi:144 en/style_guide.ssi:154 en/user_basics.ssi:32
#: en/user_basics.ssi:42 en/user_basics.ssi:58 en/user_basics.ssi:73
#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:128
#: en/user_basics.ssi:140 en/user_basics.ssi:152 en/user_basics.ssi:160
@@ -40,10 +41,10 @@ msgstr ""
#: en/user_basics.ssi:202 en/user_basics.ssi:218 en/user_basics.ssi:226
#: en/user_basics.ssi:236 en/user_basics.ssi:254 en/user_basics.ssi:282
#: en/user_basics.ssi:298 en/user_basics.ssi:306 en/user_basics.ssi:326
-#: en/user_basics.ssi:351 en/user_customization-binary.ssi:16
-#: en/user_customization-binary.ssi:27 en/user_customization-contents.ssi:26
-#: en/user_customization-contents.ssi:35 en/user_customization-contents.ssi:54
-#: en/user_customization-contents.ssi:66
+#: en/user_basics.ssi:351 en/user_customization-binary.ssi:14
+#: en/user_customization-binary.ssi:28 en/user_customization-binary.ssi:39
+#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
+#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
@@ -67,25 +68,26 @@ msgstr ""
#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
#: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
-#: en/user_customization-runtime.ssi:104 en/user_customization-runtime.ssi:114
-#: en/user_customization-runtime.ssi:122 en/user_examples.ssi:14
-#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
-#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
-#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
-#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
-#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
-#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
-#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
-#: en/user_examples.ssi:277 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:74
-#: en/user_installation.ssi:82 en/user_installation.ssi:90
-#: en/user_installation.ssi:114 en/user_installation.ssi:129
-#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
+#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
+#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:67 en/user_examples.ssi:83
+#: en/user_examples.ssi:93 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:127 en/user_examples.ssi:141 en/user_examples.ssi:149
+#: en/user_examples.ssi:157 en/user_examples.ssi:165 en/user_examples.ssi:181
+#: en/user_examples.ssi:193 en/user_examples.ssi:209 en/user_examples.ssi:223
+#: en/user_examples.ssi:232 en/user_examples.ssi:250 en/user_examples.ssi:258
+#: en/user_examples.ssi:267 en/user_examples.ssi:277
+#: en/user_installation.ssi:38 en/user_installation.ssi:46
+#: en/user_installation.ssi:56 en/user_installation.ssi:64
+#: en/user_installation.ssi:74 en/user_installation.ssi:82
+#: en/user_installation.ssi:90 en/user_installation.ssi:114
+#: en/user_installation.ssi:129 en/user_installation.ssi:146
+#: en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
-#: en/user_overview.ssi:48 en/user_overview.ssi:56
+#: en/user_overview.ssi:49 en/user_overview.ssi:57
msgid "code{"
msgstr "code{"
@@ -100,7 +102,8 @@ msgstr "code{"
#: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/style_guide.ssi:128 en/user_basics.ssi:36
+#: en/project_procedures.ssi:131 en/style_guide.ssi:128 en/style_guide.ssi:138
+#: en/style_guide.ssi:148 en/style_guide.ssi:158 en/user_basics.ssi:36
#: en/user_basics.ssi:46 en/user_basics.ssi:64 en/user_basics.ssi:77
#: en/user_basics.ssi:112 en/user_basics.ssi:120 en/user_basics.ssi:134
#: en/user_basics.ssi:144 en/user_basics.ssi:156 en/user_basics.ssi:164
@@ -108,10 +111,10 @@ msgstr "code{"
#: en/user_basics.ssi:206 en/user_basics.ssi:222 en/user_basics.ssi:230
#: en/user_basics.ssi:240 en/user_basics.ssi:274 en/user_basics.ssi:286
#: en/user_basics.ssi:302 en/user_basics.ssi:310 en/user_basics.ssi:337
-#: en/user_basics.ssi:376 en/user_customization-binary.ssi:23
-#: en/user_customization-binary.ssi:33 en/user_customization-contents.ssi:31
-#: en/user_customization-contents.ssi:46 en/user_customization-contents.ssi:58
-#: en/user_customization-contents.ssi:70
+#: en/user_basics.ssi:376 en/user_customization-binary.ssi:18
+#: en/user_customization-binary.ssi:35 en/user_customization-binary.ssi:45
+#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
+#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
#: en/user_customization-installer.ssi:38
#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
@@ -135,25 +138,26 @@ msgstr "code{"
#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
#: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
#: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
-#: en/user_customization-runtime.ssi:108 en/user_customization-runtime.ssi:118
-#: en/user_customization-runtime.ssi:127 en/user_examples.ssi:20
-#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
-#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
-#: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
-#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
-#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
-#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
-#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
-#: en/user_examples.ssi:291 en/user_installation.ssi:42
-#: en/user_installation.ssi:50 en/user_installation.ssi:60
-#: en/user_installation.ssi:70 en/user_installation.ssi:78
-#: en/user_installation.ssi:86 en/user_installation.ssi:94
-#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
+#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
+#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:61 en/user_examples.ssi:71 en/user_examples.ssi:89
+#: en/user_examples.ssi:103 en/user_examples.ssi:111 en/user_examples.ssi:121
+#: en/user_examples.ssi:133 en/user_examples.ssi:145 en/user_examples.ssi:153
+#: en/user_examples.ssi:161 en/user_examples.ssi:169 en/user_examples.ssi:189
+#: en/user_examples.ssi:205 en/user_examples.ssi:213 en/user_examples.ssi:228
+#: en/user_examples.ssi:236 en/user_examples.ssi:254 en/user_examples.ssi:263
+#: en/user_examples.ssi:273 en/user_examples.ssi:291
+#: en/user_installation.ssi:42 en/user_installation.ssi:50
+#: en/user_installation.ssi:60 en/user_installation.ssi:70
+#: en/user_installation.ssi:78 en/user_installation.ssi:86
+#: en/user_installation.ssi:94 en/user_installation.ssi:119
+#: en/user_installation.ssi:136 en/user_installation.ssi:149
+#: en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
-#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:42
-#: en/user_overview.ssi:52 en/user_overview.ssi:60
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:43
+#: en/user_overview.ssi:53 en/user_overview.ssi:61
msgid "}code"
msgstr "}code"
@@ -517,25 +521,25 @@ msgstr ""
msgid "_* /{Write a first draft, revise, edit, improve, redo if necessary}/"
msgstr ""
-#. type: Plain text
+#. type: Bullet: ' - '
#: en/style_guide.ssi:106
msgid ""
"Brainstorm!. You need to organize your ideas first in a logical sequence of "
"events."
msgstr ""
-#. type: Plain text
+#. type: Bullet: ' - '
#: en/style_guide.ssi:108
msgid ""
"Once you have somehow organized those ideas in your mind write a first draft."
msgstr ""
-#. type: Plain text
+#. type: Bullet: ' - '
#: en/style_guide.ssi:110
msgid "Revise grammar, syntax and spelling."
msgstr ""
-#. type: Plain text
+#. type: Bullet: ' - '
#: en/style_guide.ssi:112
msgid "Improve your statements and redo any part if necessary."
msgstr ""
@@ -562,7 +566,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:120 en/style_guide.ssi:158
+#: en/style_guide.ssi:120 en/style_guide.ssi:192
msgid "_* /{Markup}/"
msgstr ""
@@ -583,43 +587,103 @@ msgstr ""
#. type: Plain text
#: en/style_guide.ssi:130
+msgid "Here are some markup examples that may prove useful:"
+msgstr ""
+
+#. type: Bullet: ' - '
+#: en/style_guide.ssi:132
+msgid "For emphasis/bold text:"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:136
+#, no-wrap
+msgid "*{foo}* or !{foo}!\n"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:140
+msgid "produces: *{foo}* or !{foo}!. Use it to emphasize certain key words."
+msgstr ""
+
+#. type: Bullet: ' - '
+#: en/style_guide.ssi:142
+msgid "For italics:"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:146
+msgid "/{foo}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:150
+msgid "produces: /{foo}/. Use them e.g. for the names of debian packages."
+msgstr ""
+
+#. type: Bullet: ' - '
+#: en/style_guide.ssi:152
+msgid "For monospace:"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:156
+msgid "#{foo}#"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:160
+msgid ""
+"produces: #{foo}#. Use it e.g. for the names of commands. And also to "
+"highlight some key words or things like paths."
+msgstr ""
+
+#. type: Bullet: ' - '
+#: en/style_guide.ssi:162
+msgid ""
+"For code blocks use #{code{}# to open and #{}code}# to close the tags. It is "
+"important to remember to leave a space at the beginning of each line of code."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:164
msgid "2~ Guidelines for translators"
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:132
+#: en/style_guide.ssi:166
msgid ""
"This section deals with some general considerations to be taken into account "
"when translating the contents of live-manual."
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:134
+#: en/style_guide.ssi:168
msgid ""
"As a general recommendation, translators should have read and understood the "
-"translation rules that apply to their specific languages. Usually "
+"translation rules that apply to their specific languages. Usually, "
"translation groups and mailing lists provide information on how to produce "
"translated work that complies with Debian quality standards."
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:136
+#: en/style_guide.ssi:170
#, no-wrap
msgid "*{Note:}* Translators should also read {Contributing to this document}#how-to-contribute. In particular the section {Translation}#translation\n"
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:138
+#: en/style_guide.ssi:172
msgid "3~ Translation hints"
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:140
+#: en/style_guide.ssi:174
msgid "_* /{Comments}/"
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:142
+#: en/style_guide.ssi:176
msgid ""
"The role of the translator is to convey as faithfully as possible the "
"meaning of words, sentences, paragraphs and texts as written by the original "
@@ -627,7 +691,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:144
+#: en/style_guide.ssi:178
msgid ""
"So they should refrain from adding personal comments or extra bits of "
"information of their own. If they want to add a comment for other "
@@ -638,12 +702,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:146
+#: en/style_guide.ssi:180
msgid "_* /{TN, Translator's Note}/"
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:148
+#: en/style_guide.ssi:182
msgid ""
"It is perfectly acceptable however, to include a word or an expression in "
"brackets in the translated text if, and only if, that makes the meaning of a "
@@ -653,12 +717,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:150
+#: en/style_guide.ssi:184
msgid "_* /{Impersonal sentences}/"
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:152
+#: en/style_guide.ssi:186
msgid ""
"Documents written in English make an extensive use of the impersonal form "
"\"you\". In some other languages that do not share this characteristic, this "
@@ -669,12 +733,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:154
+#: en/style_guide.ssi:188
msgid "_* /{False friends}/"
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:156
+#: en/style_guide.ssi:190
msgid ""
"The trap of \"false friends\" explained before especially applies to "
"translators. Double check the meaning of suspicious false friends if in "
@@ -682,21 +746,21 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:160
+#: en/style_guide.ssi:194
msgid ""
"Translators working initially with *{pot}* files and later on with *{po}* "
"files will find many markup features in the strings. They can translate the "
-"text anyway but it is extremely important that they use exactly the same "
-"markup as the original English version."
+"text anyway, as long as it is translatable, but it is extremely important "
+"that they use exactly the same markup as the original English version."
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:162
+#: en/style_guide.ssi:196
msgid "_* /{Code blocks}/"
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:164
+#: en/style_guide.ssi:198
msgid ""
"Some translators decide to include the code blocks in the translated files "
"because it is easier for them to identify what has already been translated "
@@ -705,13 +769,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:166
+#: en/style_guide.ssi:200
msgid ""
"Include the code blocks if you want to score a 100% complete translation."
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:168
+#: en/style_guide.ssi:202
msgid ""
"On the other hand some translators prefer to leave the code blocks "
"\"untranslated\" (i.e. not including them). This makes the translation "
@@ -720,71 +784,71 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:170
+#: en/style_guide.ssi:204
msgid ""
"Leave the code blocks empty (they will be automatically added then) if you "
"want to make your translation easier to maintain."
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:172
+#: en/style_guide.ssi:206
msgid "_* /{New lines}/"
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:174
+#: en/style_guide.ssi:208
msgid ""
-"The translated texts need to have the exact same new lines (\\n) as the "
-"original texts. Be careful to press the \"Enter\" key or type *{\\n}* if "
-"they appear in the original files. These new lines often appear, for "
-"instance, in the code blocks."
+"The translated texts need to have the exact same new lines as the original "
+"texts. Be careful to press the \"Enter\" key or type *{\\n}* if they appear "
+"in the original files. These new lines often appear, for instance, in the "
+"code blocks."
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:176
+#: en/style_guide.ssi:210
msgid ""
"Make no mistake, this does not mean that the translated text needs to have "
"the same length as the English version. That is nearly impossible."
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:178
+#: en/style_guide.ssi:212
msgid "_* /{Untranslatable strings}/"
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:180
+#: en/style_guide.ssi:214
msgid "Translators should never translate:"
msgstr ""
-#. type: Bullet: ' * '
-#: en/style_guide.ssi:182
+#. type: Bullet: ' - '
+#: en/style_guide.ssi:216
msgid "The code names of releases"
msgstr ""
-#. type: Bullet: ' * '
-#: en/style_guide.ssi:184
+#. type: Bullet: ' - '
+#: en/style_guide.ssi:218
msgid "The names of programs"
msgstr ""
-#. type: Bullet: ' * '
-#: en/style_guide.ssi:186
+#. type: Bullet: ' - '
+#: en/style_guide.ssi:220
msgid "The commands given as examples"
msgstr ""
-#. type: Bullet: ' * '
-#: en/style_guide.ssi:188
+#. type: Bullet: ' - '
+#: en/style_guide.ssi:222
msgid ""
"Metadata (often between colons *{:metadata:}*) especially the date in /{live-"
"manual.ssm.po}/ because it changes every time live-manual is updated."
msgstr ""
-#. type: Bullet: ' * '
-#: en/style_guide.ssi:190
+#. type: Bullet: ' - '
+#: en/style_guide.ssi:224
msgid "Links"
msgstr ""
-#. type: Bullet: ' * '
-#: en/style_guide.ssi:191
+#. type: Bullet: ' - '
+#: en/style_guide.ssi:225
msgid "Paths"
msgstr ""
diff --git a/manual/po/it/live-manual.ssm.po b/manual/po/it/live-manual.ssm.po
index bc7eaff..1cbd516 100644
--- a/manual/po/it/live-manual.ssm.po
+++ b/manual/po/it/live-manual.ssm.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2012-03-24 11:45+0100\n"
+"POT-Creation-Date: 2012-03-31 16:26+0300\n"
"PO-Revision-Date: 2011-03-11 10:33+0100\n"
"Last-Translator: skizzhg <skizzhg at gmx.com>\n"
"Language-Team: Italian <tp at lists.linux.it>\n"
@@ -49,7 +49,7 @@ msgstr ""
#, no-wrap
msgid ""
"@date:\n"
-" :published: 2012-03-24\n"
+" :published: 2012-03-31\n"
msgstr ""
#. type: Plain text
diff --git a/manual/po/it/style_guide.ssi.po b/manual/po/it/style_guide.ssi.po
index 4188c8c..17e29e4 100644
--- a/manual/po/it/style_guide.ssi.po
+++ b/manual/po/it/style_guide.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-02-11 16:42+0100\n"
+"POT-Creation-Date: 2012-03-31 16:26+0300\n"
"PO-Revision-Date: 2012-02-11 16:42+0100\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -32,7 +32,8 @@ msgstr ""
#: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/style_guide.ssi:124 en/user_basics.ssi:32
+#: en/project_procedures.ssi:58 en/style_guide.ssi:124 en/style_guide.ssi:134
+#: en/style_guide.ssi:144 en/style_guide.ssi:154 en/user_basics.ssi:32
#: en/user_basics.ssi:42 en/user_basics.ssi:58 en/user_basics.ssi:73
#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:128
#: en/user_basics.ssi:140 en/user_basics.ssi:152 en/user_basics.ssi:160
@@ -40,10 +41,10 @@ msgstr ""
#: en/user_basics.ssi:202 en/user_basics.ssi:218 en/user_basics.ssi:226
#: en/user_basics.ssi:236 en/user_basics.ssi:254 en/user_basics.ssi:282
#: en/user_basics.ssi:298 en/user_basics.ssi:306 en/user_basics.ssi:326
-#: en/user_basics.ssi:351 en/user_customization-binary.ssi:16
-#: en/user_customization-binary.ssi:27 en/user_customization-contents.ssi:26
-#: en/user_customization-contents.ssi:35 en/user_customization-contents.ssi:54
-#: en/user_customization-contents.ssi:66
+#: en/user_basics.ssi:351 en/user_customization-binary.ssi:14
+#: en/user_customization-binary.ssi:28 en/user_customization-binary.ssi:39
+#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
+#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
@@ -67,25 +68,26 @@ msgstr ""
#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
#: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
-#: en/user_customization-runtime.ssi:104 en/user_customization-runtime.ssi:114
-#: en/user_customization-runtime.ssi:122 en/user_examples.ssi:14
-#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
-#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
-#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
-#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
-#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
-#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
-#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
-#: en/user_examples.ssi:277 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:74
-#: en/user_installation.ssi:82 en/user_installation.ssi:90
-#: en/user_installation.ssi:114 en/user_installation.ssi:129
-#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
+#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
+#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:67 en/user_examples.ssi:83
+#: en/user_examples.ssi:93 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:127 en/user_examples.ssi:141 en/user_examples.ssi:149
+#: en/user_examples.ssi:157 en/user_examples.ssi:165 en/user_examples.ssi:181
+#: en/user_examples.ssi:193 en/user_examples.ssi:209 en/user_examples.ssi:223
+#: en/user_examples.ssi:232 en/user_examples.ssi:250 en/user_examples.ssi:258
+#: en/user_examples.ssi:267 en/user_examples.ssi:277
+#: en/user_installation.ssi:38 en/user_installation.ssi:46
+#: en/user_installation.ssi:56 en/user_installation.ssi:64
+#: en/user_installation.ssi:74 en/user_installation.ssi:82
+#: en/user_installation.ssi:90 en/user_installation.ssi:114
+#: en/user_installation.ssi:129 en/user_installation.ssi:146
+#: en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
-#: en/user_overview.ssi:48 en/user_overview.ssi:56
+#: en/user_overview.ssi:49 en/user_overview.ssi:57
msgid "code{"
msgstr "code{"
@@ -100,7 +102,8 @@ msgstr "code{"
#: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/style_guide.ssi:128 en/user_basics.ssi:36
+#: en/project_procedures.ssi:131 en/style_guide.ssi:128 en/style_guide.ssi:138
+#: en/style_guide.ssi:148 en/style_guide.ssi:158 en/user_basics.ssi:36
#: en/user_basics.ssi:46 en/user_basics.ssi:64 en/user_basics.ssi:77
#: en/user_basics.ssi:112 en/user_basics.ssi:120 en/user_basics.ssi:134
#: en/user_basics.ssi:144 en/user_basics.ssi:156 en/user_basics.ssi:164
@@ -108,10 +111,10 @@ msgstr "code{"
#: en/user_basics.ssi:206 en/user_basics.ssi:222 en/user_basics.ssi:230
#: en/user_basics.ssi:240 en/user_basics.ssi:274 en/user_basics.ssi:286
#: en/user_basics.ssi:302 en/user_basics.ssi:310 en/user_basics.ssi:337
-#: en/user_basics.ssi:376 en/user_customization-binary.ssi:23
-#: en/user_customization-binary.ssi:33 en/user_customization-contents.ssi:31
-#: en/user_customization-contents.ssi:46 en/user_customization-contents.ssi:58
-#: en/user_customization-contents.ssi:70
+#: en/user_basics.ssi:376 en/user_customization-binary.ssi:18
+#: en/user_customization-binary.ssi:35 en/user_customization-binary.ssi:45
+#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
+#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
#: en/user_customization-installer.ssi:38
#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
@@ -135,25 +138,26 @@ msgstr "code{"
#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
#: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
#: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
-#: en/user_customization-runtime.ssi:108 en/user_customization-runtime.ssi:118
-#: en/user_customization-runtime.ssi:127 en/user_examples.ssi:20
-#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
-#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
-#: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
-#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
-#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
-#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
-#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
-#: en/user_examples.ssi:291 en/user_installation.ssi:42
-#: en/user_installation.ssi:50 en/user_installation.ssi:60
-#: en/user_installation.ssi:70 en/user_installation.ssi:78
-#: en/user_installation.ssi:86 en/user_installation.ssi:94
-#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
+#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
+#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:61 en/user_examples.ssi:71 en/user_examples.ssi:89
+#: en/user_examples.ssi:103 en/user_examples.ssi:111 en/user_examples.ssi:121
+#: en/user_examples.ssi:133 en/user_examples.ssi:145 en/user_examples.ssi:153
+#: en/user_examples.ssi:161 en/user_examples.ssi:169 en/user_examples.ssi:189
+#: en/user_examples.ssi:205 en/user_examples.ssi:213 en/user_examples.ssi:228
+#: en/user_examples.ssi:236 en/user_examples.ssi:254 en/user_examples.ssi:263
+#: en/user_examples.ssi:273 en/user_examples.ssi:291
+#: en/user_installation.ssi:42 en/user_installation.ssi:50
+#: en/user_installation.ssi:60 en/user_installation.ssi:70
+#: en/user_installation.ssi:78 en/user_installation.ssi:86
+#: en/user_installation.ssi:94 en/user_installation.ssi:119
+#: en/user_installation.ssi:136 en/user_installation.ssi:149
+#: en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
-#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:42
-#: en/user_overview.ssi:52 en/user_overview.ssi:60
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:43
+#: en/user_overview.ssi:53 en/user_overview.ssi:61
msgid "}code"
msgstr "}code"
@@ -517,25 +521,25 @@ msgstr ""
msgid "_* /{Write a first draft, revise, edit, improve, redo if necessary}/"
msgstr ""
-#. type: Plain text
+#. type: Bullet: ' - '
#: en/style_guide.ssi:106
msgid ""
"Brainstorm!. You need to organize your ideas first in a logical sequence of "
"events."
msgstr ""
-#. type: Plain text
+#. type: Bullet: ' - '
#: en/style_guide.ssi:108
msgid ""
"Once you have somehow organized those ideas in your mind write a first draft."
msgstr ""
-#. type: Plain text
+#. type: Bullet: ' - '
#: en/style_guide.ssi:110
msgid "Revise grammar, syntax and spelling."
msgstr ""
-#. type: Plain text
+#. type: Bullet: ' - '
#: en/style_guide.ssi:112
msgid "Improve your statements and redo any part if necessary."
msgstr ""
@@ -562,7 +566,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:120 en/style_guide.ssi:158
+#: en/style_guide.ssi:120 en/style_guide.ssi:192
msgid "_* /{Markup}/"
msgstr ""
@@ -583,43 +587,103 @@ msgstr ""
#. type: Plain text
#: en/style_guide.ssi:130
+msgid "Here are some markup examples that may prove useful:"
+msgstr ""
+
+#. type: Bullet: ' - '
+#: en/style_guide.ssi:132
+msgid "For emphasis/bold text:"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:136
+#, no-wrap
+msgid "*{foo}* or !{foo}!\n"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:140
+msgid "produces: *{foo}* or !{foo}!. Use it to emphasize certain key words."
+msgstr ""
+
+#. type: Bullet: ' - '
+#: en/style_guide.ssi:142
+msgid "For italics:"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:146
+msgid "/{foo}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:150
+msgid "produces: /{foo}/. Use them e.g. for the names of debian packages."
+msgstr ""
+
+#. type: Bullet: ' - '
+#: en/style_guide.ssi:152
+msgid "For monospace:"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:156
+msgid "#{foo}#"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:160
+msgid ""
+"produces: #{foo}#. Use it e.g. for the names of commands. And also to "
+"highlight some key words or things like paths."
+msgstr ""
+
+#. type: Bullet: ' - '
+#: en/style_guide.ssi:162
+msgid ""
+"For code blocks use #{code{}# to open and #{}code}# to close the tags. It is "
+"important to remember to leave a space at the beginning of each line of code."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:164
msgid "2~ Guidelines for translators"
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:132
+#: en/style_guide.ssi:166
msgid ""
"This section deals with some general considerations to be taken into account "
"when translating the contents of live-manual."
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:134
+#: en/style_guide.ssi:168
msgid ""
"As a general recommendation, translators should have read and understood the "
-"translation rules that apply to their specific languages. Usually "
+"translation rules that apply to their specific languages. Usually, "
"translation groups and mailing lists provide information on how to produce "
"translated work that complies with Debian quality standards."
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:136
+#: en/style_guide.ssi:170
#, no-wrap
msgid "*{Note:}* Translators should also read {Contributing to this document}#how-to-contribute. In particular the section {Translation}#translation\n"
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:138
+#: en/style_guide.ssi:172
msgid "3~ Translation hints"
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:140
+#: en/style_guide.ssi:174
msgid "_* /{Comments}/"
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:142
+#: en/style_guide.ssi:176
msgid ""
"The role of the translator is to convey as faithfully as possible the "
"meaning of words, sentences, paragraphs and texts as written by the original "
@@ -627,7 +691,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:144
+#: en/style_guide.ssi:178
msgid ""
"So they should refrain from adding personal comments or extra bits of "
"information of their own. If they want to add a comment for other "
@@ -638,12 +702,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:146
+#: en/style_guide.ssi:180
msgid "_* /{TN, Translator's Note}/"
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:148
+#: en/style_guide.ssi:182
msgid ""
"It is perfectly acceptable however, to include a word or an expression in "
"brackets in the translated text if, and only if, that makes the meaning of a "
@@ -653,12 +717,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:150
+#: en/style_guide.ssi:184
msgid "_* /{Impersonal sentences}/"
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:152
+#: en/style_guide.ssi:186
msgid ""
"Documents written in English make an extensive use of the impersonal form "
"\"you\". In some other languages that do not share this characteristic, this "
@@ -669,12 +733,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:154
+#: en/style_guide.ssi:188
msgid "_* /{False friends}/"
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:156
+#: en/style_guide.ssi:190
msgid ""
"The trap of \"false friends\" explained before especially applies to "
"translators. Double check the meaning of suspicious false friends if in "
@@ -682,21 +746,21 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:160
+#: en/style_guide.ssi:194
msgid ""
"Translators working initially with *{pot}* files and later on with *{po}* "
"files will find many markup features in the strings. They can translate the "
-"text anyway but it is extremely important that they use exactly the same "
-"markup as the original English version."
+"text anyway, as long as it is translatable, but it is extremely important "
+"that they use exactly the same markup as the original English version."
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:162
+#: en/style_guide.ssi:196
msgid "_* /{Code blocks}/"
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:164
+#: en/style_guide.ssi:198
msgid ""
"Some translators decide to include the code blocks in the translated files "
"because it is easier for them to identify what has already been translated "
@@ -705,13 +769,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:166
+#: en/style_guide.ssi:200
msgid ""
"Include the code blocks if you want to score a 100% complete translation."
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:168
+#: en/style_guide.ssi:202
msgid ""
"On the other hand some translators prefer to leave the code blocks "
"\"untranslated\" (i.e. not including them). This makes the translation "
@@ -720,71 +784,71 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:170
+#: en/style_guide.ssi:204
msgid ""
"Leave the code blocks empty (they will be automatically added then) if you "
"want to make your translation easier to maintain."
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:172
+#: en/style_guide.ssi:206
msgid "_* /{New lines}/"
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:174
+#: en/style_guide.ssi:208
msgid ""
-"The translated texts need to have the exact same new lines (\\n) as the "
-"original texts. Be careful to press the \"Enter\" key or type *{\\n}* if "
-"they appear in the original files. These new lines often appear, for "
-"instance, in the code blocks."
+"The translated texts need to have the exact same new lines as the original "
+"texts. Be careful to press the \"Enter\" key or type *{\\n}* if they appear "
+"in the original files. These new lines often appear, for instance, in the "
+"code blocks."
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:176
+#: en/style_guide.ssi:210
msgid ""
"Make no mistake, this does not mean that the translated text needs to have "
"the same length as the English version. That is nearly impossible."
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:178
+#: en/style_guide.ssi:212
msgid "_* /{Untranslatable strings}/"
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:180
+#: en/style_guide.ssi:214
msgid "Translators should never translate:"
msgstr ""
-#. type: Bullet: ' * '
-#: en/style_guide.ssi:182
+#. type: Bullet: ' - '
+#: en/style_guide.ssi:216
msgid "The code names of releases"
msgstr ""
-#. type: Bullet: ' * '
-#: en/style_guide.ssi:184
+#. type: Bullet: ' - '
+#: en/style_guide.ssi:218
msgid "The names of programs"
msgstr ""
-#. type: Bullet: ' * '
-#: en/style_guide.ssi:186
+#. type: Bullet: ' - '
+#: en/style_guide.ssi:220
msgid "The commands given as examples"
msgstr ""
-#. type: Bullet: ' * '
-#: en/style_guide.ssi:188
+#. type: Bullet: ' - '
+#: en/style_guide.ssi:222
msgid ""
"Metadata (often between colons *{:metadata:}*) especially the date in /{live-"
"manual.ssm.po}/ because it changes every time live-manual is updated."
msgstr ""
-#. type: Bullet: ' * '
-#: en/style_guide.ssi:190
+#. type: Bullet: ' - '
+#: en/style_guide.ssi:224
msgid "Links"
msgstr ""
-#. type: Bullet: ' * '
-#: en/style_guide.ssi:191
+#. type: Bullet: ' - '
+#: en/style_guide.ssi:225
msgid "Paths"
msgstr ""
diff --git a/manual/po/pt_BR/live-manual.ssm.po b/manual/po/pt_BR/live-manual.ssm.po
index 9af575b..d418087 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 2.0.0\n"
-"POT-Creation-Date: 2012-03-24 11:45+0100\n"
+"POT-Creation-Date: 2012-03-31 16:26+0300\n"
"PO-Revision-Date: 2010-10-22 07:52-0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -45,7 +45,7 @@ msgstr ""
#, no-wrap
msgid ""
"@date:\n"
-" :published: 2012-03-24\n"
+" :published: 2012-03-31\n"
msgstr ""
#. type: Plain text
diff --git a/manual/po/pt_BR/style_guide.ssi.po b/manual/po/pt_BR/style_guide.ssi.po
index b649734..0b6edf3 100644
--- a/manual/po/pt_BR/style_guide.ssi.po
+++ b/manual/po/pt_BR/style_guide.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-02-11 16:42+0100\n"
+"POT-Creation-Date: 2012-03-31 16:26+0300\n"
"PO-Revision-Date: 2012-02-11 16:42+0100\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -32,7 +32,8 @@ msgstr ""
#: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/style_guide.ssi:124 en/user_basics.ssi:32
+#: en/project_procedures.ssi:58 en/style_guide.ssi:124 en/style_guide.ssi:134
+#: en/style_guide.ssi:144 en/style_guide.ssi:154 en/user_basics.ssi:32
#: en/user_basics.ssi:42 en/user_basics.ssi:58 en/user_basics.ssi:73
#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:128
#: en/user_basics.ssi:140 en/user_basics.ssi:152 en/user_basics.ssi:160
@@ -40,10 +41,10 @@ msgstr ""
#: en/user_basics.ssi:202 en/user_basics.ssi:218 en/user_basics.ssi:226
#: en/user_basics.ssi:236 en/user_basics.ssi:254 en/user_basics.ssi:282
#: en/user_basics.ssi:298 en/user_basics.ssi:306 en/user_basics.ssi:326
-#: en/user_basics.ssi:351 en/user_customization-binary.ssi:16
-#: en/user_customization-binary.ssi:27 en/user_customization-contents.ssi:26
-#: en/user_customization-contents.ssi:35 en/user_customization-contents.ssi:54
-#: en/user_customization-contents.ssi:66
+#: en/user_basics.ssi:351 en/user_customization-binary.ssi:14
+#: en/user_customization-binary.ssi:28 en/user_customization-binary.ssi:39
+#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
+#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
@@ -67,25 +68,26 @@ msgstr ""
#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
#: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
-#: en/user_customization-runtime.ssi:104 en/user_customization-runtime.ssi:114
-#: en/user_customization-runtime.ssi:122 en/user_examples.ssi:14
-#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
-#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
-#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
-#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
-#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
-#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
-#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
-#: en/user_examples.ssi:277 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:74
-#: en/user_installation.ssi:82 en/user_installation.ssi:90
-#: en/user_installation.ssi:114 en/user_installation.ssi:129
-#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
+#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
+#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:67 en/user_examples.ssi:83
+#: en/user_examples.ssi:93 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:127 en/user_examples.ssi:141 en/user_examples.ssi:149
+#: en/user_examples.ssi:157 en/user_examples.ssi:165 en/user_examples.ssi:181
+#: en/user_examples.ssi:193 en/user_examples.ssi:209 en/user_examples.ssi:223
+#: en/user_examples.ssi:232 en/user_examples.ssi:250 en/user_examples.ssi:258
+#: en/user_examples.ssi:267 en/user_examples.ssi:277
+#: en/user_installation.ssi:38 en/user_installation.ssi:46
+#: en/user_installation.ssi:56 en/user_installation.ssi:64
+#: en/user_installation.ssi:74 en/user_installation.ssi:82
+#: en/user_installation.ssi:90 en/user_installation.ssi:114
+#: en/user_installation.ssi:129 en/user_installation.ssi:146
+#: en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
-#: en/user_overview.ssi:48 en/user_overview.ssi:56
+#: en/user_overview.ssi:49 en/user_overview.ssi:57
msgid "code{"
msgstr "code{"
@@ -100,7 +102,8 @@ msgstr "code{"
#: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/style_guide.ssi:128 en/user_basics.ssi:36
+#: en/project_procedures.ssi:131 en/style_guide.ssi:128 en/style_guide.ssi:138
+#: en/style_guide.ssi:148 en/style_guide.ssi:158 en/user_basics.ssi:36
#: en/user_basics.ssi:46 en/user_basics.ssi:64 en/user_basics.ssi:77
#: en/user_basics.ssi:112 en/user_basics.ssi:120 en/user_basics.ssi:134
#: en/user_basics.ssi:144 en/user_basics.ssi:156 en/user_basics.ssi:164
@@ -108,10 +111,10 @@ msgstr "code{"
#: en/user_basics.ssi:206 en/user_basics.ssi:222 en/user_basics.ssi:230
#: en/user_basics.ssi:240 en/user_basics.ssi:274 en/user_basics.ssi:286
#: en/user_basics.ssi:302 en/user_basics.ssi:310 en/user_basics.ssi:337
-#: en/user_basics.ssi:376 en/user_customization-binary.ssi:23
-#: en/user_customization-binary.ssi:33 en/user_customization-contents.ssi:31
-#: en/user_customization-contents.ssi:46 en/user_customization-contents.ssi:58
-#: en/user_customization-contents.ssi:70
+#: en/user_basics.ssi:376 en/user_customization-binary.ssi:18
+#: en/user_customization-binary.ssi:35 en/user_customization-binary.ssi:45
+#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
+#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
#: en/user_customization-installer.ssi:38
#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
@@ -135,25 +138,26 @@ msgstr "code{"
#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
#: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
#: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
-#: en/user_customization-runtime.ssi:108 en/user_customization-runtime.ssi:118
-#: en/user_customization-runtime.ssi:127 en/user_examples.ssi:20
-#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
-#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
-#: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
-#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
-#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
-#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
-#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
-#: en/user_examples.ssi:291 en/user_installation.ssi:42
-#: en/user_installation.ssi:50 en/user_installation.ssi:60
-#: en/user_installation.ssi:70 en/user_installation.ssi:78
-#: en/user_installation.ssi:86 en/user_installation.ssi:94
-#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
+#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
+#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:61 en/user_examples.ssi:71 en/user_examples.ssi:89
+#: en/user_examples.ssi:103 en/user_examples.ssi:111 en/user_examples.ssi:121
+#: en/user_examples.ssi:133 en/user_examples.ssi:145 en/user_examples.ssi:153
+#: en/user_examples.ssi:161 en/user_examples.ssi:169 en/user_examples.ssi:189
+#: en/user_examples.ssi:205 en/user_examples.ssi:213 en/user_examples.ssi:228
+#: en/user_examples.ssi:236 en/user_examples.ssi:254 en/user_examples.ssi:263
+#: en/user_examples.ssi:273 en/user_examples.ssi:291
+#: en/user_installation.ssi:42 en/user_installation.ssi:50
+#: en/user_installation.ssi:60 en/user_installation.ssi:70
+#: en/user_installation.ssi:78 en/user_installation.ssi:86
+#: en/user_installation.ssi:94 en/user_installation.ssi:119
+#: en/user_installation.ssi:136 en/user_installation.ssi:149
+#: en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
-#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:42
-#: en/user_overview.ssi:52 en/user_overview.ssi:60
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:43
+#: en/user_overview.ssi:53 en/user_overview.ssi:61
msgid "}code"
msgstr "}code"
@@ -517,25 +521,25 @@ msgstr ""
msgid "_* /{Write a first draft, revise, edit, improve, redo if necessary}/"
msgstr ""
-#. type: Plain text
+#. type: Bullet: ' - '
#: en/style_guide.ssi:106
msgid ""
"Brainstorm!. You need to organize your ideas first in a logical sequence of "
"events."
msgstr ""
-#. type: Plain text
+#. type: Bullet: ' - '
#: en/style_guide.ssi:108
msgid ""
"Once you have somehow organized those ideas in your mind write a first draft."
msgstr ""
-#. type: Plain text
+#. type: Bullet: ' - '
#: en/style_guide.ssi:110
msgid "Revise grammar, syntax and spelling."
msgstr ""
-#. type: Plain text
+#. type: Bullet: ' - '
#: en/style_guide.ssi:112
msgid "Improve your statements and redo any part if necessary."
msgstr ""
@@ -562,7 +566,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:120 en/style_guide.ssi:158
+#: en/style_guide.ssi:120 en/style_guide.ssi:192
msgid "_* /{Markup}/"
msgstr ""
@@ -583,43 +587,103 @@ msgstr ""
#. type: Plain text
#: en/style_guide.ssi:130
+msgid "Here are some markup examples that may prove useful:"
+msgstr ""
+
+#. type: Bullet: ' - '
+#: en/style_guide.ssi:132
+msgid "For emphasis/bold text:"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:136
+#, no-wrap
+msgid "*{foo}* or !{foo}!\n"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:140
+msgid "produces: *{foo}* or !{foo}!. Use it to emphasize certain key words."
+msgstr ""
+
+#. type: Bullet: ' - '
+#: en/style_guide.ssi:142
+msgid "For italics:"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:146
+msgid "/{foo}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:150
+msgid "produces: /{foo}/. Use them e.g. for the names of debian packages."
+msgstr ""
+
+#. type: Bullet: ' - '
+#: en/style_guide.ssi:152
+msgid "For monospace:"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:156
+msgid "#{foo}#"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:160
+msgid ""
+"produces: #{foo}#. Use it e.g. for the names of commands. And also to "
+"highlight some key words or things like paths."
+msgstr ""
+
+#. type: Bullet: ' - '
+#: en/style_guide.ssi:162
+msgid ""
+"For code blocks use #{code{}# to open and #{}code}# to close the tags. It is "
+"important to remember to leave a space at the beginning of each line of code."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:164
msgid "2~ Guidelines for translators"
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:132
+#: en/style_guide.ssi:166
msgid ""
"This section deals with some general considerations to be taken into account "
"when translating the contents of live-manual."
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:134
+#: en/style_guide.ssi:168
msgid ""
"As a general recommendation, translators should have read and understood the "
-"translation rules that apply to their specific languages. Usually "
+"translation rules that apply to their specific languages. Usually, "
"translation groups and mailing lists provide information on how to produce "
"translated work that complies with Debian quality standards."
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:136
+#: en/style_guide.ssi:170
#, no-wrap
msgid "*{Note:}* Translators should also read {Contributing to this document}#how-to-contribute. In particular the section {Translation}#translation\n"
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:138
+#: en/style_guide.ssi:172
msgid "3~ Translation hints"
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:140
+#: en/style_guide.ssi:174
msgid "_* /{Comments}/"
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:142
+#: en/style_guide.ssi:176
msgid ""
"The role of the translator is to convey as faithfully as possible the "
"meaning of words, sentences, paragraphs and texts as written by the original "
@@ -627,7 +691,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:144
+#: en/style_guide.ssi:178
msgid ""
"So they should refrain from adding personal comments or extra bits of "
"information of their own. If they want to add a comment for other "
@@ -638,12 +702,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:146
+#: en/style_guide.ssi:180
msgid "_* /{TN, Translator's Note}/"
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:148
+#: en/style_guide.ssi:182
msgid ""
"It is perfectly acceptable however, to include a word or an expression in "
"brackets in the translated text if, and only if, that makes the meaning of a "
@@ -653,12 +717,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:150
+#: en/style_guide.ssi:184
msgid "_* /{Impersonal sentences}/"
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:152
+#: en/style_guide.ssi:186
msgid ""
"Documents written in English make an extensive use of the impersonal form "
"\"you\". In some other languages that do not share this characteristic, this "
@@ -669,12 +733,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:154
+#: en/style_guide.ssi:188
msgid "_* /{False friends}/"
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:156
+#: en/style_guide.ssi:190
msgid ""
"The trap of \"false friends\" explained before especially applies to "
"translators. Double check the meaning of suspicious false friends if in "
@@ -682,21 +746,21 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:160
+#: en/style_guide.ssi:194
msgid ""
"Translators working initially with *{pot}* files and later on with *{po}* "
"files will find many markup features in the strings. They can translate the "
-"text anyway but it is extremely important that they use exactly the same "
-"markup as the original English version."
+"text anyway, as long as it is translatable, but it is extremely important "
+"that they use exactly the same markup as the original English version."
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:162
+#: en/style_guide.ssi:196
msgid "_* /{Code blocks}/"
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:164
+#: en/style_guide.ssi:198
msgid ""
"Some translators decide to include the code blocks in the translated files "
"because it is easier for them to identify what has already been translated "
@@ -705,13 +769,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:166
+#: en/style_guide.ssi:200
msgid ""
"Include the code blocks if you want to score a 100% complete translation."
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:168
+#: en/style_guide.ssi:202
msgid ""
"On the other hand some translators prefer to leave the code blocks "
"\"untranslated\" (i.e. not including them). This makes the translation "
@@ -720,71 +784,71 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:170
+#: en/style_guide.ssi:204
msgid ""
"Leave the code blocks empty (they will be automatically added then) if you "
"want to make your translation easier to maintain."
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:172
+#: en/style_guide.ssi:206
msgid "_* /{New lines}/"
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:174
+#: en/style_guide.ssi:208
msgid ""
-"The translated texts need to have the exact same new lines (\\n) as the "
-"original texts. Be careful to press the \"Enter\" key or type *{\\n}* if "
-"they appear in the original files. These new lines often appear, for "
-"instance, in the code blocks."
+"The translated texts need to have the exact same new lines as the original "
+"texts. Be careful to press the \"Enter\" key or type *{\\n}* if they appear "
+"in the original files. These new lines often appear, for instance, in the "
+"code blocks."
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:176
+#: en/style_guide.ssi:210
msgid ""
"Make no mistake, this does not mean that the translated text needs to have "
"the same length as the English version. That is nearly impossible."
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:178
+#: en/style_guide.ssi:212
msgid "_* /{Untranslatable strings}/"
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:180
+#: en/style_guide.ssi:214
msgid "Translators should never translate:"
msgstr ""
-#. type: Bullet: ' * '
-#: en/style_guide.ssi:182
+#. type: Bullet: ' - '
+#: en/style_guide.ssi:216
msgid "The code names of releases"
msgstr ""
-#. type: Bullet: ' * '
-#: en/style_guide.ssi:184
+#. type: Bullet: ' - '
+#: en/style_guide.ssi:218
msgid "The names of programs"
msgstr ""
-#. type: Bullet: ' * '
-#: en/style_guide.ssi:186
+#. type: Bullet: ' - '
+#: en/style_guide.ssi:220
msgid "The commands given as examples"
msgstr ""
-#. type: Bullet: ' * '
-#: en/style_guide.ssi:188
+#. type: Bullet: ' - '
+#: en/style_guide.ssi:222
msgid ""
"Metadata (often between colons *{:metadata:}*) especially the date in /{live-"
"manual.ssm.po}/ because it changes every time live-manual is updated."
msgstr ""
-#. type: Bullet: ' * '
-#: en/style_guide.ssi:190
+#. type: Bullet: ' - '
+#: en/style_guide.ssi:224
msgid "Links"
msgstr ""
-#. type: Bullet: ' * '
-#: en/style_guide.ssi:191
+#. type: Bullet: ' - '
+#: en/style_guide.ssi:225
msgid "Paths"
msgstr ""
diff --git a/manual/po/ro/live-manual.ssm.po b/manual/po/ro/live-manual.ssm.po
index 3fc585f..ee33090 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 2.0.0\n"
-"POT-Creation-Date: 2012-03-24 11:45+0100\n"
+"POT-Creation-Date: 2012-03-31 16:26+0300\n"
"PO-Revision-Date: 2010-10-23 00:04+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -46,7 +46,7 @@ msgstr ""
#, no-wrap
msgid ""
"@date:\n"
-" :published: 2012-03-24\n"
+" :published: 2012-03-31\n"
msgstr ""
#. type: Plain text
diff --git a/manual/po/ro/style_guide.ssi.po b/manual/po/ro/style_guide.ssi.po
index bac980f..b2f70b5 100644
--- a/manual/po/ro/style_guide.ssi.po
+++ b/manual/po/ro/style_guide.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-02-11 16:42+0100\n"
+"POT-Creation-Date: 2012-03-31 16:26+0300\n"
"PO-Revision-Date: 2012-02-11 16:42+0100\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -33,7 +33,8 @@ msgstr ""
#: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/style_guide.ssi:124 en/user_basics.ssi:32
+#: en/project_procedures.ssi:58 en/style_guide.ssi:124 en/style_guide.ssi:134
+#: en/style_guide.ssi:144 en/style_guide.ssi:154 en/user_basics.ssi:32
#: en/user_basics.ssi:42 en/user_basics.ssi:58 en/user_basics.ssi:73
#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:128
#: en/user_basics.ssi:140 en/user_basics.ssi:152 en/user_basics.ssi:160
@@ -41,10 +42,10 @@ msgstr ""
#: en/user_basics.ssi:202 en/user_basics.ssi:218 en/user_basics.ssi:226
#: en/user_basics.ssi:236 en/user_basics.ssi:254 en/user_basics.ssi:282
#: en/user_basics.ssi:298 en/user_basics.ssi:306 en/user_basics.ssi:326
-#: en/user_basics.ssi:351 en/user_customization-binary.ssi:16
-#: en/user_customization-binary.ssi:27 en/user_customization-contents.ssi:26
-#: en/user_customization-contents.ssi:35 en/user_customization-contents.ssi:54
-#: en/user_customization-contents.ssi:66
+#: en/user_basics.ssi:351 en/user_customization-binary.ssi:14
+#: en/user_customization-binary.ssi:28 en/user_customization-binary.ssi:39
+#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
+#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
@@ -68,25 +69,26 @@ msgstr ""
#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
#: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
-#: en/user_customization-runtime.ssi:104 en/user_customization-runtime.ssi:114
-#: en/user_customization-runtime.ssi:122 en/user_examples.ssi:14
-#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
-#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
-#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
-#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
-#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
-#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
-#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
-#: en/user_examples.ssi:277 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:74
-#: en/user_installation.ssi:82 en/user_installation.ssi:90
-#: en/user_installation.ssi:114 en/user_installation.ssi:129
-#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
+#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
+#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:67 en/user_examples.ssi:83
+#: en/user_examples.ssi:93 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:127 en/user_examples.ssi:141 en/user_examples.ssi:149
+#: en/user_examples.ssi:157 en/user_examples.ssi:165 en/user_examples.ssi:181
+#: en/user_examples.ssi:193 en/user_examples.ssi:209 en/user_examples.ssi:223
+#: en/user_examples.ssi:232 en/user_examples.ssi:250 en/user_examples.ssi:258
+#: en/user_examples.ssi:267 en/user_examples.ssi:277
+#: en/user_installation.ssi:38 en/user_installation.ssi:46
+#: en/user_installation.ssi:56 en/user_installation.ssi:64
+#: en/user_installation.ssi:74 en/user_installation.ssi:82
+#: en/user_installation.ssi:90 en/user_installation.ssi:114
+#: en/user_installation.ssi:129 en/user_installation.ssi:146
+#: en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
-#: en/user_overview.ssi:48 en/user_overview.ssi:56
+#: en/user_overview.ssi:49 en/user_overview.ssi:57
msgid "code{"
msgstr "code{"
@@ -101,7 +103,8 @@ msgstr "code{"
#: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/style_guide.ssi:128 en/user_basics.ssi:36
+#: en/project_procedures.ssi:131 en/style_guide.ssi:128 en/style_guide.ssi:138
+#: en/style_guide.ssi:148 en/style_guide.ssi:158 en/user_basics.ssi:36
#: en/user_basics.ssi:46 en/user_basics.ssi:64 en/user_basics.ssi:77
#: en/user_basics.ssi:112 en/user_basics.ssi:120 en/user_basics.ssi:134
#: en/user_basics.ssi:144 en/user_basics.ssi:156 en/user_basics.ssi:164
@@ -109,10 +112,10 @@ msgstr "code{"
#: en/user_basics.ssi:206 en/user_basics.ssi:222 en/user_basics.ssi:230
#: en/user_basics.ssi:240 en/user_basics.ssi:274 en/user_basics.ssi:286
#: en/user_basics.ssi:302 en/user_basics.ssi:310 en/user_basics.ssi:337
-#: en/user_basics.ssi:376 en/user_customization-binary.ssi:23
-#: en/user_customization-binary.ssi:33 en/user_customization-contents.ssi:31
-#: en/user_customization-contents.ssi:46 en/user_customization-contents.ssi:58
-#: en/user_customization-contents.ssi:70
+#: en/user_basics.ssi:376 en/user_customization-binary.ssi:18
+#: en/user_customization-binary.ssi:35 en/user_customization-binary.ssi:45
+#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
+#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
#: en/user_customization-installer.ssi:38
#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
@@ -136,25 +139,26 @@ msgstr "code{"
#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
#: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
#: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
-#: en/user_customization-runtime.ssi:108 en/user_customization-runtime.ssi:118
-#: en/user_customization-runtime.ssi:127 en/user_examples.ssi:20
-#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
-#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
-#: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
-#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
-#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
-#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
-#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
-#: en/user_examples.ssi:291 en/user_installation.ssi:42
-#: en/user_installation.ssi:50 en/user_installation.ssi:60
-#: en/user_installation.ssi:70 en/user_installation.ssi:78
-#: en/user_installation.ssi:86 en/user_installation.ssi:94
-#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
+#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
+#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:61 en/user_examples.ssi:71 en/user_examples.ssi:89
+#: en/user_examples.ssi:103 en/user_examples.ssi:111 en/user_examples.ssi:121
+#: en/user_examples.ssi:133 en/user_examples.ssi:145 en/user_examples.ssi:153
+#: en/user_examples.ssi:161 en/user_examples.ssi:169 en/user_examples.ssi:189
+#: en/user_examples.ssi:205 en/user_examples.ssi:213 en/user_examples.ssi:228
+#: en/user_examples.ssi:236 en/user_examples.ssi:254 en/user_examples.ssi:263
+#: en/user_examples.ssi:273 en/user_examples.ssi:291
+#: en/user_installation.ssi:42 en/user_installation.ssi:50
+#: en/user_installation.ssi:60 en/user_installation.ssi:70
+#: en/user_installation.ssi:78 en/user_installation.ssi:86
+#: en/user_installation.ssi:94 en/user_installation.ssi:119
+#: en/user_installation.ssi:136 en/user_installation.ssi:149
+#: en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
-#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:42
-#: en/user_overview.ssi:52 en/user_overview.ssi:60
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:43
+#: en/user_overview.ssi:53 en/user_overview.ssi:61
msgid "}code"
msgstr "}code"
@@ -518,25 +522,25 @@ msgstr ""
msgid "_* /{Write a first draft, revise, edit, improve, redo if necessary}/"
msgstr ""
-#. type: Plain text
+#. type: Bullet: ' - '
#: en/style_guide.ssi:106
msgid ""
"Brainstorm!. You need to organize your ideas first in a logical sequence of "
"events."
msgstr ""
-#. type: Plain text
+#. type: Bullet: ' - '
#: en/style_guide.ssi:108
msgid ""
"Once you have somehow organized those ideas in your mind write a first draft."
msgstr ""
-#. type: Plain text
+#. type: Bullet: ' - '
#: en/style_guide.ssi:110
msgid "Revise grammar, syntax and spelling."
msgstr ""
-#. type: Plain text
+#. type: Bullet: ' - '
#: en/style_guide.ssi:112
msgid "Improve your statements and redo any part if necessary."
msgstr ""
@@ -563,7 +567,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:120 en/style_guide.ssi:158
+#: en/style_guide.ssi:120 en/style_guide.ssi:192
msgid "_* /{Markup}/"
msgstr ""
@@ -584,43 +588,103 @@ msgstr ""
#. type: Plain text
#: en/style_guide.ssi:130
+msgid "Here are some markup examples that may prove useful:"
+msgstr ""
+
+#. type: Bullet: ' - '
+#: en/style_guide.ssi:132
+msgid "For emphasis/bold text:"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:136
+#, no-wrap
+msgid "*{foo}* or !{foo}!\n"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:140
+msgid "produces: *{foo}* or !{foo}!. Use it to emphasize certain key words."
+msgstr ""
+
+#. type: Bullet: ' - '
+#: en/style_guide.ssi:142
+msgid "For italics:"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:146
+msgid "/{foo}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:150
+msgid "produces: /{foo}/. Use them e.g. for the names of debian packages."
+msgstr ""
+
+#. type: Bullet: ' - '
+#: en/style_guide.ssi:152
+msgid "For monospace:"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:156
+msgid "#{foo}#"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:160
+msgid ""
+"produces: #{foo}#. Use it e.g. for the names of commands. And also to "
+"highlight some key words or things like paths."
+msgstr ""
+
+#. type: Bullet: ' - '
+#: en/style_guide.ssi:162
+msgid ""
+"For code blocks use #{code{}# to open and #{}code}# to close the tags. It is "
+"important to remember to leave a space at the beginning of each line of code."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:164
msgid "2~ Guidelines for translators"
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:132
+#: en/style_guide.ssi:166
msgid ""
"This section deals with some general considerations to be taken into account "
"when translating the contents of live-manual."
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:134
+#: en/style_guide.ssi:168
msgid ""
"As a general recommendation, translators should have read and understood the "
-"translation rules that apply to their specific languages. Usually "
+"translation rules that apply to their specific languages. Usually, "
"translation groups and mailing lists provide information on how to produce "
"translated work that complies with Debian quality standards."
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:136
+#: en/style_guide.ssi:170
#, no-wrap
msgid "*{Note:}* Translators should also read {Contributing to this document}#how-to-contribute. In particular the section {Translation}#translation\n"
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:138
+#: en/style_guide.ssi:172
msgid "3~ Translation hints"
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:140
+#: en/style_guide.ssi:174
msgid "_* /{Comments}/"
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:142
+#: en/style_guide.ssi:176
msgid ""
"The role of the translator is to convey as faithfully as possible the "
"meaning of words, sentences, paragraphs and texts as written by the original "
@@ -628,7 +692,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:144
+#: en/style_guide.ssi:178
msgid ""
"So they should refrain from adding personal comments or extra bits of "
"information of their own. If they want to add a comment for other "
@@ -639,12 +703,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:146
+#: en/style_guide.ssi:180
msgid "_* /{TN, Translator's Note}/"
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:148
+#: en/style_guide.ssi:182
msgid ""
"It is perfectly acceptable however, to include a word or an expression in "
"brackets in the translated text if, and only if, that makes the meaning of a "
@@ -654,12 +718,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:150
+#: en/style_guide.ssi:184
msgid "_* /{Impersonal sentences}/"
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:152
+#: en/style_guide.ssi:186
msgid ""
"Documents written in English make an extensive use of the impersonal form "
"\"you\". In some other languages that do not share this characteristic, this "
@@ -670,12 +734,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:154
+#: en/style_guide.ssi:188
msgid "_* /{False friends}/"
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:156
+#: en/style_guide.ssi:190
msgid ""
"The trap of \"false friends\" explained before especially applies to "
"translators. Double check the meaning of suspicious false friends if in "
@@ -683,21 +747,21 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:160
+#: en/style_guide.ssi:194
msgid ""
"Translators working initially with *{pot}* files and later on with *{po}* "
"files will find many markup features in the strings. They can translate the "
-"text anyway but it is extremely important that they use exactly the same "
-"markup as the original English version."
+"text anyway, as long as it is translatable, but it is extremely important "
+"that they use exactly the same markup as the original English version."
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:162
+#: en/style_guide.ssi:196
msgid "_* /{Code blocks}/"
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:164
+#: en/style_guide.ssi:198
msgid ""
"Some translators decide to include the code blocks in the translated files "
"because it is easier for them to identify what has already been translated "
@@ -706,13 +770,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:166
+#: en/style_guide.ssi:200
msgid ""
"Include the code blocks if you want to score a 100% complete translation."
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:168
+#: en/style_guide.ssi:202
msgid ""
"On the other hand some translators prefer to leave the code blocks "
"\"untranslated\" (i.e. not including them). This makes the translation "
@@ -721,71 +785,71 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:170
+#: en/style_guide.ssi:204
msgid ""
"Leave the code blocks empty (they will be automatically added then) if you "
"want to make your translation easier to maintain."
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:172
+#: en/style_guide.ssi:206
msgid "_* /{New lines}/"
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:174
+#: en/style_guide.ssi:208
msgid ""
-"The translated texts need to have the exact same new lines (\\n) as the "
-"original texts. Be careful to press the \"Enter\" key or type *{\\n}* if "
-"they appear in the original files. These new lines often appear, for "
-"instance, in the code blocks."
+"The translated texts need to have the exact same new lines as the original "
+"texts. Be careful to press the \"Enter\" key or type *{\\n}* if they appear "
+"in the original files. These new lines often appear, for instance, in the "
+"code blocks."
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:176
+#: en/style_guide.ssi:210
msgid ""
"Make no mistake, this does not mean that the translated text needs to have "
"the same length as the English version. That is nearly impossible."
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:178
+#: en/style_guide.ssi:212
msgid "_* /{Untranslatable strings}/"
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:180
+#: en/style_guide.ssi:214
msgid "Translators should never translate:"
msgstr ""
-#. type: Bullet: ' * '
-#: en/style_guide.ssi:182
+#. type: Bullet: ' - '
+#: en/style_guide.ssi:216
msgid "The code names of releases"
msgstr ""
-#. type: Bullet: ' * '
-#: en/style_guide.ssi:184
+#. type: Bullet: ' - '
+#: en/style_guide.ssi:218
msgid "The names of programs"
msgstr ""
-#. type: Bullet: ' * '
-#: en/style_guide.ssi:186
+#. type: Bullet: ' - '
+#: en/style_guide.ssi:220
msgid "The commands given as examples"
msgstr ""
-#. type: Bullet: ' * '
-#: en/style_guide.ssi:188
+#. type: Bullet: ' - '
+#: en/style_guide.ssi:222
msgid ""
"Metadata (often between colons *{:metadata:}*) especially the date in /{live-"
"manual.ssm.po}/ because it changes every time live-manual is updated."
msgstr ""
-#. type: Bullet: ' * '
-#: en/style_guide.ssi:190
+#. type: Bullet: ' - '
+#: en/style_guide.ssi:224
msgid "Links"
msgstr ""
-#. type: Bullet: ' * '
-#: en/style_guide.ssi:191
+#. type: Bullet: ' - '
+#: en/style_guide.ssi:225
msgid "Paths"
msgstr ""
diff --git a/manual/pot/live-manual.ssm.pot b/manual/pot/live-manual.ssm.pot
index 126cea8..b695683 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: 2012-03-24 11:45+0100\n"
+"POT-Creation-Date: 2012-03-31 16:26+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -45,7 +45,7 @@ msgstr ""
#, no-wrap
msgid ""
"@date:\n"
-" :published: 2012-03-24\n"
+" :published: 2012-03-31\n"
msgstr ""
#. type: Plain text
diff --git a/manual/pot/style_guide.ssi.pot b/manual/pot/style_guide.ssi.pot
index 128c11d..3a25d5c 100644
--- a/manual/pot/style_guide.ssi.pot
+++ b/manual/pot/style_guide.ssi.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-02-11 16:42+0100\n"
+"POT-Creation-Date: 2012-03-31 16:26+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -32,7 +32,8 @@ msgstr ""
#: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/style_guide.ssi:124 en/user_basics.ssi:32
+#: en/project_procedures.ssi:58 en/style_guide.ssi:124 en/style_guide.ssi:134
+#: en/style_guide.ssi:144 en/style_guide.ssi:154 en/user_basics.ssi:32
#: en/user_basics.ssi:42 en/user_basics.ssi:58 en/user_basics.ssi:73
#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:128
#: en/user_basics.ssi:140 en/user_basics.ssi:152 en/user_basics.ssi:160
@@ -40,10 +41,10 @@ msgstr ""
#: en/user_basics.ssi:202 en/user_basics.ssi:218 en/user_basics.ssi:226
#: en/user_basics.ssi:236 en/user_basics.ssi:254 en/user_basics.ssi:282
#: en/user_basics.ssi:298 en/user_basics.ssi:306 en/user_basics.ssi:326
-#: en/user_basics.ssi:351 en/user_customization-binary.ssi:16
-#: en/user_customization-binary.ssi:27 en/user_customization-contents.ssi:26
-#: en/user_customization-contents.ssi:35 en/user_customization-contents.ssi:54
-#: en/user_customization-contents.ssi:66
+#: en/user_basics.ssi:351 en/user_customization-binary.ssi:14
+#: en/user_customization-binary.ssi:28 en/user_customization-binary.ssi:39
+#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
+#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
@@ -67,25 +68,26 @@ msgstr ""
#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
#: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
-#: en/user_customization-runtime.ssi:104 en/user_customization-runtime.ssi:114
-#: en/user_customization-runtime.ssi:122 en/user_examples.ssi:14
-#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
-#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
-#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
-#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
-#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
-#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
-#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
-#: en/user_examples.ssi:277 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:74
-#: en/user_installation.ssi:82 en/user_installation.ssi:90
-#: en/user_installation.ssi:114 en/user_installation.ssi:129
-#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
+#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
+#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:67 en/user_examples.ssi:83
+#: en/user_examples.ssi:93 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:127 en/user_examples.ssi:141 en/user_examples.ssi:149
+#: en/user_examples.ssi:157 en/user_examples.ssi:165 en/user_examples.ssi:181
+#: en/user_examples.ssi:193 en/user_examples.ssi:209 en/user_examples.ssi:223
+#: en/user_examples.ssi:232 en/user_examples.ssi:250 en/user_examples.ssi:258
+#: en/user_examples.ssi:267 en/user_examples.ssi:277
+#: en/user_installation.ssi:38 en/user_installation.ssi:46
+#: en/user_installation.ssi:56 en/user_installation.ssi:64
+#: en/user_installation.ssi:74 en/user_installation.ssi:82
+#: en/user_installation.ssi:90 en/user_installation.ssi:114
+#: en/user_installation.ssi:129 en/user_installation.ssi:146
+#: en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
-#: en/user_overview.ssi:48 en/user_overview.ssi:56
+#: en/user_overview.ssi:49 en/user_overview.ssi:57
msgid "code{"
msgstr ""
@@ -100,7 +102,8 @@ msgstr ""
#: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/style_guide.ssi:128 en/user_basics.ssi:36
+#: en/project_procedures.ssi:131 en/style_guide.ssi:128 en/style_guide.ssi:138
+#: en/style_guide.ssi:148 en/style_guide.ssi:158 en/user_basics.ssi:36
#: en/user_basics.ssi:46 en/user_basics.ssi:64 en/user_basics.ssi:77
#: en/user_basics.ssi:112 en/user_basics.ssi:120 en/user_basics.ssi:134
#: en/user_basics.ssi:144 en/user_basics.ssi:156 en/user_basics.ssi:164
@@ -108,10 +111,10 @@ msgstr ""
#: en/user_basics.ssi:206 en/user_basics.ssi:222 en/user_basics.ssi:230
#: en/user_basics.ssi:240 en/user_basics.ssi:274 en/user_basics.ssi:286
#: en/user_basics.ssi:302 en/user_basics.ssi:310 en/user_basics.ssi:337
-#: en/user_basics.ssi:376 en/user_customization-binary.ssi:23
-#: en/user_customization-binary.ssi:33 en/user_customization-contents.ssi:31
-#: en/user_customization-contents.ssi:46 en/user_customization-contents.ssi:58
-#: en/user_customization-contents.ssi:70
+#: en/user_basics.ssi:376 en/user_customization-binary.ssi:18
+#: en/user_customization-binary.ssi:35 en/user_customization-binary.ssi:45
+#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
+#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
#: en/user_customization-installer.ssi:38
#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
@@ -135,25 +138,26 @@ msgstr ""
#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
#: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
#: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
-#: en/user_customization-runtime.ssi:108 en/user_customization-runtime.ssi:118
-#: en/user_customization-runtime.ssi:127 en/user_examples.ssi:20
-#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
-#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
-#: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
-#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
-#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
-#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
-#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
-#: en/user_examples.ssi:291 en/user_installation.ssi:42
-#: en/user_installation.ssi:50 en/user_installation.ssi:60
-#: en/user_installation.ssi:70 en/user_installation.ssi:78
-#: en/user_installation.ssi:86 en/user_installation.ssi:94
-#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
+#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
+#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:61 en/user_examples.ssi:71 en/user_examples.ssi:89
+#: en/user_examples.ssi:103 en/user_examples.ssi:111 en/user_examples.ssi:121
+#: en/user_examples.ssi:133 en/user_examples.ssi:145 en/user_examples.ssi:153
+#: en/user_examples.ssi:161 en/user_examples.ssi:169 en/user_examples.ssi:189
+#: en/user_examples.ssi:205 en/user_examples.ssi:213 en/user_examples.ssi:228
+#: en/user_examples.ssi:236 en/user_examples.ssi:254 en/user_examples.ssi:263
+#: en/user_examples.ssi:273 en/user_examples.ssi:291
+#: en/user_installation.ssi:42 en/user_installation.ssi:50
+#: en/user_installation.ssi:60 en/user_installation.ssi:70
+#: en/user_installation.ssi:78 en/user_installation.ssi:86
+#: en/user_installation.ssi:94 en/user_installation.ssi:119
+#: en/user_installation.ssi:136 en/user_installation.ssi:149
+#: en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
-#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:42
-#: en/user_overview.ssi:52 en/user_overview.ssi:60
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:43
+#: en/user_overview.ssi:53 en/user_overview.ssi:61
msgid "}code"
msgstr ""
@@ -517,25 +521,25 @@ msgstr ""
msgid "_* /{Write a first draft, revise, edit, improve, redo if necessary}/"
msgstr ""
-#. type: Plain text
+#. type: Bullet: ' - '
#: en/style_guide.ssi:106
msgid ""
"Brainstorm!. You need to organize your ideas first in a logical sequence of "
"events."
msgstr ""
-#. type: Plain text
+#. type: Bullet: ' - '
#: en/style_guide.ssi:108
msgid ""
"Once you have somehow organized those ideas in your mind write a first draft."
msgstr ""
-#. type: Plain text
+#. type: Bullet: ' - '
#: en/style_guide.ssi:110
msgid "Revise grammar, syntax and spelling."
msgstr ""
-#. type: Plain text
+#. type: Bullet: ' - '
#: en/style_guide.ssi:112
msgid "Improve your statements and redo any part if necessary."
msgstr ""
@@ -562,7 +566,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:120 en/style_guide.ssi:158
+#: en/style_guide.ssi:120 en/style_guide.ssi:192
msgid "_* /{Markup}/"
msgstr ""
@@ -583,43 +587,103 @@ msgstr ""
#. type: Plain text
#: en/style_guide.ssi:130
+msgid "Here are some markup examples that may prove useful:"
+msgstr ""
+
+#. type: Bullet: ' - '
+#: en/style_guide.ssi:132
+msgid "For emphasis/bold text:"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:136
+#, no-wrap
+msgid "*{foo}* or !{foo}!\n"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:140
+msgid "produces: *{foo}* or !{foo}!. Use it to emphasize certain key words."
+msgstr ""
+
+#. type: Bullet: ' - '
+#: en/style_guide.ssi:142
+msgid "For italics:"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:146
+msgid "/{foo}/"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:150
+msgid "produces: /{foo}/. Use them e.g. for the names of debian packages."
+msgstr ""
+
+#. type: Bullet: ' - '
+#: en/style_guide.ssi:152
+msgid "For monospace:"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:156
+msgid "#{foo}#"
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:160
+msgid ""
+"produces: #{foo}#. Use it e.g. for the names of commands. And also to "
+"highlight some key words or things like paths."
+msgstr ""
+
+#. type: Bullet: ' - '
+#: en/style_guide.ssi:162
+msgid ""
+"For code blocks use #{code{}# to open and #{}code}# to close the tags. It is "
+"important to remember to leave a space at the beginning of each line of code."
+msgstr ""
+
+#. type: Plain text
+#: en/style_guide.ssi:164
msgid "2~ Guidelines for translators"
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:132
+#: en/style_guide.ssi:166
msgid ""
"This section deals with some general considerations to be taken into account "
"when translating the contents of live-manual."
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:134
+#: en/style_guide.ssi:168
msgid ""
"As a general recommendation, translators should have read and understood the "
-"translation rules that apply to their specific languages. Usually "
+"translation rules that apply to their specific languages. Usually, "
"translation groups and mailing lists provide information on how to produce "
"translated work that complies with Debian quality standards."
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:136
+#: en/style_guide.ssi:170
#, no-wrap
msgid "*{Note:}* Translators should also read {Contributing to this document}#how-to-contribute. In particular the section {Translation}#translation\n"
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:138
+#: en/style_guide.ssi:172
msgid "3~ Translation hints"
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:140
+#: en/style_guide.ssi:174
msgid "_* /{Comments}/"
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:142
+#: en/style_guide.ssi:176
msgid ""
"The role of the translator is to convey as faithfully as possible the "
"meaning of words, sentences, paragraphs and texts as written by the original "
@@ -627,7 +691,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:144
+#: en/style_guide.ssi:178
msgid ""
"So they should refrain from adding personal comments or extra bits of "
"information of their own. If they want to add a comment for other "
@@ -638,12 +702,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:146
+#: en/style_guide.ssi:180
msgid "_* /{TN, Translator's Note}/"
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:148
+#: en/style_guide.ssi:182
msgid ""
"It is perfectly acceptable however, to include a word or an expression in "
"brackets in the translated text if, and only if, that makes the meaning of a "
@@ -653,12 +717,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:150
+#: en/style_guide.ssi:184
msgid "_* /{Impersonal sentences}/"
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:152
+#: en/style_guide.ssi:186
msgid ""
"Documents written in English make an extensive use of the impersonal form "
"\"you\". In some other languages that do not share this characteristic, this "
@@ -669,12 +733,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:154
+#: en/style_guide.ssi:188
msgid "_* /{False friends}/"
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:156
+#: en/style_guide.ssi:190
msgid ""
"The trap of \"false friends\" explained before especially applies to "
"translators. Double check the meaning of suspicious false friends if in "
@@ -682,21 +746,21 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:160
+#: en/style_guide.ssi:194
msgid ""
"Translators working initially with *{pot}* files and later on with *{po}* "
"files will find many markup features in the strings. They can translate the "
-"text anyway but it is extremely important that they use exactly the same "
-"markup as the original English version."
+"text anyway, as long as it is translatable, but it is extremely important "
+"that they use exactly the same markup as the original English version."
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:162
+#: en/style_guide.ssi:196
msgid "_* /{Code blocks}/"
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:164
+#: en/style_guide.ssi:198
msgid ""
"Some translators decide to include the code blocks in the translated files "
"because it is easier for them to identify what has already been translated "
@@ -705,13 +769,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:166
+#: en/style_guide.ssi:200
msgid ""
"Include the code blocks if you want to score a 100% complete translation."
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:168
+#: en/style_guide.ssi:202
msgid ""
"On the other hand some translators prefer to leave the code blocks "
"\"untranslated\" (i.e. not including them). This makes the translation "
@@ -720,71 +784,71 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:170
+#: en/style_guide.ssi:204
msgid ""
"Leave the code blocks empty (they will be automatically added then) if you "
"want to make your translation easier to maintain."
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:172
+#: en/style_guide.ssi:206
msgid "_* /{New lines}/"
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:174
+#: en/style_guide.ssi:208
msgid ""
-"The translated texts need to have the exact same new lines (\\n) as the "
-"original texts. Be careful to press the \"Enter\" key or type *{\\n}* if "
-"they appear in the original files. These new lines often appear, for "
-"instance, in the code blocks."
+"The translated texts need to have the exact same new lines as the original "
+"texts. Be careful to press the \"Enter\" key or type *{\\n}* if they appear "
+"in the original files. These new lines often appear, for instance, in the "
+"code blocks."
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:176
+#: en/style_guide.ssi:210
msgid ""
"Make no mistake, this does not mean that the translated text needs to have "
"the same length as the English version. That is nearly impossible."
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:178
+#: en/style_guide.ssi:212
msgid "_* /{Untranslatable strings}/"
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:180
+#: en/style_guide.ssi:214
msgid "Translators should never translate:"
msgstr ""
-#. type: Bullet: ' * '
-#: en/style_guide.ssi:182
+#. type: Bullet: ' - '
+#: en/style_guide.ssi:216
msgid "The code names of releases"
msgstr ""
-#. type: Bullet: ' * '
-#: en/style_guide.ssi:184
+#. type: Bullet: ' - '
+#: en/style_guide.ssi:218
msgid "The names of programs"
msgstr ""
-#. type: Bullet: ' * '
-#: en/style_guide.ssi:186
+#. type: Bullet: ' - '
+#: en/style_guide.ssi:220
msgid "The commands given as examples"
msgstr ""
-#. type: Bullet: ' * '
-#: en/style_guide.ssi:188
+#. type: Bullet: ' - '
+#: en/style_guide.ssi:222
msgid ""
"Metadata (often between colons *{:metadata:}*) especially the date in /{live-"
"manual.ssm.po}/ because it changes every time live-manual is updated."
msgstr ""
-#. type: Bullet: ' * '
-#: en/style_guide.ssi:190
+#. type: Bullet: ' - '
+#: en/style_guide.ssi:224
msgid "Links"
msgstr ""
-#. type: Bullet: ' * '
-#: en/style_guide.ssi:191
+#. type: Bullet: ' - '
+#: en/style_guide.ssi:225
msgid "Paths"
msgstr ""
diff --git a/manual/pt_BR/live-manual.ssm b/manual/pt_BR/live-manual.ssm
index 1fa12a4..96483b7 100644
--- a/manual/pt_BR/live-manual.ssm
+++ b/manual/pt_BR/live-manual.ssm
@@ -9,7 +9,7 @@
:license: This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.<br><br>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.<br><br>You should have received a copy of the GNU General Public License along with this program. If not, see http://www.gnu.org/licenses/. <br><br>The complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL-3 file.
@date:
- :published: 2012-03-24
+ :published: 2012-03-31
@publisher: Debian Live Project <debian-live at lists.debian.org>
diff --git a/manual/pt_BR/style_guide.ssi b/manual/pt_BR/style_guide.ssi
index 3fe12c1..eae8bd9 100644
--- a/manual/pt_BR/style_guide.ssi
+++ b/manual/pt_BR/style_guide.ssi
@@ -176,15 +176,15 @@ copyrighted graphics or logos) that is published with it.
_* /{Write a first draft, revise, edit, improve, redo if necessary}/
-Brainstorm!. You need to organize your ideas first in a logical sequence of
-events.
+ - Brainstorm!. You need to organize your ideas first in a logical sequence
+ of events.
-Once you have somehow organized those ideas in your mind write a first
-draft.
+ - Once you have somehow organized those ideas in your mind write a first
+ draft.
-Revise grammar, syntax and spelling.
+ - Revise grammar, syntax and spelling.
-Improve your statements and redo any part if necessary.
+ - Improve your statements and redo any part if necessary.
_* /{Chapters}/
@@ -210,13 +210,50 @@ code{
}code
+Here are some markup examples that may prove useful:
+
+ - For emphasis/bold text:
+
+code{
+
+*{foo}* or !{foo}!
+
+}code
+
+produces: *{foo}* or !{foo}!. Use it to emphasize certain key words.
+
+ - For italics:
+
+code{
+
+/{foo}/
+
+}code
+
+produces: /{foo}/. Use them e.g. for the names of debian packages.
+
+ - For monospace:
+
+code{
+
+#{foo}#
+
+}code
+
+produces: #{foo}#. Use it e.g. for the names of commands. And also to
+highlight some key words or things like paths.
+
+ - For code blocks use #{code{}# to open and #{}code}# to close the tags. It
+ is important to remember to leave a space at the beginning of each line
+ of code.
+
2~ Guidelines for translators
This section deals with some general considerations to be taken into account
when translating the contents of live-manual.
As a general recommendation, translators should have read and understood the
-translation rules that apply to their specific languages. Usually
+translation rules that apply to their specific languages. Usually,
translation groups and mailing lists provide information on how to produce
translated work that complies with Debian quality standards.
@@ -264,8 +301,8 @@ _* /{Markup}/
Translators working initially with *{pot}* files and later on with *{po}*
files will find many markup features in the strings. They can translate the
-text anyway but it is extremely important that they use exactly the same
-markup as the original English version.
+text anyway, as long as it is translatable, but it is extremely important
+that they use exactly the same markup as the original English version.
_* /{Code blocks}/
@@ -286,10 +323,10 @@ want to make your translation easier to maintain.
_* /{New lines}/
-The translated texts need to have the exact same new lines (\n) as the
-original texts. Be careful to press the "Enter" key or type *{\n}* if they
-appear in the original files. These new lines often appear, for instance, in
-the code blocks.
+The translated texts need to have the exact same new lines as the original
+texts. Be careful to press the "Enter" key or type *{\n}* if they appear in
+the original files. These new lines often appear, for instance, in the code
+blocks.
Make no mistake, this does not mean that the translated text needs to have
the same length as the English version. That is nearly impossible.
@@ -298,16 +335,16 @@ _* /{Untranslatable strings}/
Translators should never translate:
- * The code names of releases
+ - The code names of releases
- * The names of programs
+ - The names of programs
- * The commands given as examples
+ - The commands given as examples
- * Metadata (often between colons *{:metadata:}*) especially the date in
- /{live-manual.ssm.po}/ because it changes every time live-manual is
- updated.
+ - Metadata (often between colons *{:metadata:}*) especially the date in
+ /{live-manual.ssm.po}/ because it changes every time live-manual is
+ updated.
- * Links
+ - Links
- * Paths
+ - Paths
diff --git a/manual/ro/live-manual.ssm b/manual/ro/live-manual.ssm
index 1fa12a4..96483b7 100644
--- a/manual/ro/live-manual.ssm
+++ b/manual/ro/live-manual.ssm
@@ -9,7 +9,7 @@
:license: This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.<br><br>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.<br><br>You should have received a copy of the GNU General Public License along with this program. If not, see http://www.gnu.org/licenses/. <br><br>The complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL-3 file.
@date:
- :published: 2012-03-24
+ :published: 2012-03-31
@publisher: Debian Live Project <debian-live at lists.debian.org>
diff --git a/manual/ro/style_guide.ssi b/manual/ro/style_guide.ssi
index 3fe12c1..eae8bd9 100644
--- a/manual/ro/style_guide.ssi
+++ b/manual/ro/style_guide.ssi
@@ -176,15 +176,15 @@ copyrighted graphics or logos) that is published with it.
_* /{Write a first draft, revise, edit, improve, redo if necessary}/
-Brainstorm!. You need to organize your ideas first in a logical sequence of
-events.
+ - Brainstorm!. You need to organize your ideas first in a logical sequence
+ of events.
-Once you have somehow organized those ideas in your mind write a first
-draft.
+ - Once you have somehow organized those ideas in your mind write a first
+ draft.
-Revise grammar, syntax and spelling.
+ - Revise grammar, syntax and spelling.
-Improve your statements and redo any part if necessary.
+ - Improve your statements and redo any part if necessary.
_* /{Chapters}/
@@ -210,13 +210,50 @@ code{
}code
+Here are some markup examples that may prove useful:
+
+ - For emphasis/bold text:
+
+code{
+
+*{foo}* or !{foo}!
+
+}code
+
+produces: *{foo}* or !{foo}!. Use it to emphasize certain key words.
+
+ - For italics:
+
+code{
+
+/{foo}/
+
+}code
+
+produces: /{foo}/. Use them e.g. for the names of debian packages.
+
+ - For monospace:
+
+code{
+
+#{foo}#
+
+}code
+
+produces: #{foo}#. Use it e.g. for the names of commands. And also to
+highlight some key words or things like paths.
+
+ - For code blocks use #{code{}# to open and #{}code}# to close the tags. It
+ is important to remember to leave a space at the beginning of each line
+ of code.
+
2~ Guidelines for translators
This section deals with some general considerations to be taken into account
when translating the contents of live-manual.
As a general recommendation, translators should have read and understood the
-translation rules that apply to their specific languages. Usually
+translation rules that apply to their specific languages. Usually,
translation groups and mailing lists provide information on how to produce
translated work that complies with Debian quality standards.
@@ -264,8 +301,8 @@ _* /{Markup}/
Translators working initially with *{pot}* files and later on with *{po}*
files will find many markup features in the strings. They can translate the
-text anyway but it is extremely important that they use exactly the same
-markup as the original English version.
+text anyway, as long as it is translatable, but it is extremely important
+that they use exactly the same markup as the original English version.
_* /{Code blocks}/
@@ -286,10 +323,10 @@ want to make your translation easier to maintain.
_* /{New lines}/
-The translated texts need to have the exact same new lines (\n) as the
-original texts. Be careful to press the "Enter" key or type *{\n}* if they
-appear in the original files. These new lines often appear, for instance, in
-the code blocks.
+The translated texts need to have the exact same new lines as the original
+texts. Be careful to press the "Enter" key or type *{\n}* if they appear in
+the original files. These new lines often appear, for instance, in the code
+blocks.
Make no mistake, this does not mean that the translated text needs to have
the same length as the English version. That is nearly impossible.
@@ -298,16 +335,16 @@ _* /{Untranslatable strings}/
Translators should never translate:
- * The code names of releases
+ - The code names of releases
- * The names of programs
+ - The names of programs
- * The commands given as examples
+ - The commands given as examples
- * Metadata (often between colons *{:metadata:}*) especially the date in
- /{live-manual.ssm.po}/ because it changes every time live-manual is
- updated.
+ - Metadata (often between colons *{:metadata:}*) especially the date in
+ /{live-manual.ssm.po}/ because it changes every time live-manual is
+ updated.
- * Links
+ - Links
- * Paths
+ - Paths
--
live-manual
More information about the debian-live-changes
mailing list