Unfuzzy XML-based translations - part 1

9 files changed, 47 insertions, 185 deletions

diff --git a/ca/appendix/files.xml b/ca/appendix/files.xml
index 1ecc77ba3..96a945f13 100644
--- a/ca/appendix/files.xml
+++ b/ca/appendix/files.xml
@@ -201,28 +201,12 @@ aquells que només en tenen un. Només cal afegir aquestes línies al fitxer
 
  <sect1 id="tasksel-size-list">
  <title>Espai requerit per a les tasques</title>
-
-<!-- Note for d-i and manual maintainers
- Sizes of tasks should be determined by running tasksel with the "new-install"
- option on a system that been fully installed without selecting any tasks. By
- selecting a task together with the "manual selection" option, aptitude will
- be started and show the sizes for the task. Use "cancel pending actions" to
- clear the slate, quit aptitude and repeat for other tasks.
- Space requirements need to be determined from tasksel as tasksel will not
- install recommended packages while selecting a task from aptitude will.
-
- The size for the minimal base system should be determined after running
- 'aptitude clean' using 'du -hsx /'. After that the "Standard system" task
- should be installed after which the size of the standard system should be
- determined using the same method.
--->
-
 <para>
 
 Una instal·lació estàndard per l'arquitectura i386 amb el nucli 2.6,
-incloent-hi tots els paquets estàndard, requereix 442 MiB d'espai de disc.
+incloent-hi tots els paquets estàndard, requere &std-system-size; MiB d'espai de disc.
 Una instal·lació bàsica mínima, amb la tasca <quote>estàndard</quote> no
-seleccionada, ocuparà 230 MiB.
+seleccionada, ocuparà &base-system-size; MiB.
 
 </para>
 <important><para>
diff --git a/cs/appendix/files.xml b/cs/appendix/files.xml
index 32fbd31eb..229c20c15 100644
--- a/cs/appendix/files.xml
+++ b/cs/appendix/files.xml
@@ -200,8 +200,8 @@ jednotlačítkové. Stačí do souboru
 <para>
 
 Standardní instalace na architektuře i386 s jádrem 2.6 zabere na disku
-včetně všech standardních balíků 442MB. Menší instalace bez úlohy
-<quote>Standardní systém</quote> zabere 230MB.
+včetně všech standardních balíků &std-system-size;MB. Menší instalace bez úlohy
+<quote>Standardní systém</quote> zabere &base-system-size;MB.
 
 </para><important><para>
 
diff --git a/de/appendix/files.xml b/de/appendix/files.xml
index edc6d7055..0ca3a8ad5 100644
--- a/de/appendix/files.xml
+++ b/de/appendix/files.xml
@@ -193,25 +193,10 @@ folgenden Zeilen zur Datei <filename>/etc/sysctl.conf</filename> hinzu.
  <title>Festplattenplatz, der für die Programmgruppen benötigt wird</title>
 <para>
 
-<!-- Note for d-i and manual maintainers
- Sizes of tasks should be determined by running tasksel with the "new-install"
- option on a system that been fully installed without selecting any tasks. By
- selecting a task together with the "manual selection" option, aptitude will
- be started and show the sizes for the task. Use "cancel pending actions" to
- clear the slate, quit aptitude and repeat for other tasks.
- Space requirements need to be determined from tasksel as tasksel will not
- install recommended packages while selecting a task from aptitude will.
-
- The size for the minimal base system should be determined after running
- 'aptitude clean' using 'du -hsx /'. After that the "Standard system" task
- should be installed after which the size of the standard system should be
- determined using the same method.
--->
-
 Eine Standard-Installation für die i386-Architektur inklusive aller
 Standardpakete und mit Verwendung des standardmäßigen 2.6-Kernels benötigt
-442MB Festplattenplatz. Eine minimale Basisinstallation ohne die Programmgruppe
-<quote>Standard-System</quote> belegt 230MB.
+&std-system-size;MB Festplattenplatz. Eine minimale Basisinstallation ohne die Programmgruppe
+<quote>Standard-System</quote> belegt &base-system-size;MB.
 </para>
 <important><para>
 
diff --git a/es/appendix/files.xml b/es/appendix/files.xml
index e3b1cff08..f7c6cb490 100644
--- a/es/appendix/files.xml
+++ b/es/appendix/files.xml
@@ -191,28 +191,12 @@ siguientes l�neas al fichero <filename>/etc/sysctl.conf</filename>.
 
  <sect1 id="tasksel-size-list">
  <title>Espacio en disco requerido para las tareas</title>
-
-<!-- Note for d-i and manual maintainers
-  Sizes of tasks should be determined by running tasksel with the "new-install"
-  option on a system that been fully installed without selecting any tasks. By
-  selecting a task together with the "manual selection" option, aptitude will
-  be started and show the sizes for the task. Use "cancel pending actions" to
-  clear the slate, quit aptitude and repeat for other tasks.
-  Space requirements need to be determined from tasksel as tasksel will not
-  install recommended packages while selecting a task from aptitude will.
-
-  The size for the minimal base system should be determined after running
-  'aptitude clean' using 'du -hsx /'. After that the "Standard system" task
-  should be installed after which the size of the standard system should be
-  determined using the same method.
--->
-
 <para>
 
 Una instalaci�n est�ndar para i386, incluyendo todos los paquetes
 est�ndar y el n�cleo 2.6 utilizado por omisi�n, ocupa
-442 MB de espacio en disco.  Una instalaci�n m�nima base sin seleccionar la
-tarea <quote>Sistema est�ndar</quote> ocupar� 230 MB.
+&std-system-size; MB de espacio en disco.  Una instalaci�n m�nima base sin seleccionar la
+tarea <quote>Sistema est�ndar</quote> ocupar� &base-system-size; MB.
 
 </para>
 <important><para>
diff --git a/fr/appendix/files.xml b/fr/appendix/files.xml
index 5c154989d..f317239f2 100644
--- a/fr/appendix/files.xml
+++ b/fr/appendix/files.xml
@@ -188,24 +188,10 @@ fichier <filename>/etc/sysctl.conf</filename>&nbsp;:
  <sect1 id="tasksel-size-list">
  <title>Ressources d'espace disque pour les t�ches</title>
 
-<!-- Note for d-i and manual maintainers
-  Sizes of tasks should be determined by running tasksel with the "new-install"
- option on a system that been fully installed without selecting any tasks. By
- selecting a task together with the "manual selection" option, aptitude will
- be started and show the sizes for the task. Use "cancel pending actions" to
- clear the slate, quit aptitude and repeat for other tasks.
- Space requirements need to be determined from tasksel as tasksel will not
- install recommended packages while selecting a task from aptitude will.
-
- The size for the minimal base system should be determined after running
- 'aptitude clean' using 'du -hsx /'. After that the "Standard system" task
- should be installed after which the size of the standard system should be
- determined using the same method.
--->
 <para>
 Une installation standard pour l'architecture i386, avec le noyau 2.6 par d�faut
-et tous les paquets standard, demande 442&nbsp;Mo. Une installation minimale,
-sans la t�che <emphasis>Standard system</emphasis>, demande 230&nbsp;Mo. 
+et tous les paquets standard, demande &std-system-size;&nbsp;Mo. Une installation minimale,
+sans la t�che <emphasis>Standard system</emphasis>, demande &base-system-size;&nbsp;Mo. 
 </para>
 <important><para>
 Dans ces deux cas, l'espace disque r�ellement utilis� est calcul� <emphasis>apr�s</emphasis>
diff --git a/it/appendix/files.xml b/it/appendix/files.xml
index c9e9e83d1..dcc36e31e 100644
--- a/it/appendix/files.xml
+++ b/it/appendix/files.xml
@@ -280,35 +280,19 @@ file <filename>/etc/sysctl.conf</filename>.
  <sect1 id="tasksel-size-list">
  <!-- <title>Disk Space Needed for Tasks</title> -->
  <title>Spazio su disco necessario per i task</title>
-
-<!-- Note for d-i and manual maintainers
- Sizes of tasks should be determined by running tasksel with the "new-install"
- option on a system that been fully installed without selecting any tasks. By
- selecting a task together with the "manual selection" option, aptitude will
- be started and show the sizes for the task. Use "cancel pending actions" to
- clear the slate, quit aptitude and repeat for other tasks.
- Space requirements need to be determined from tasksel as tasksel will not
- install recommended packages while selecting a task from aptitude will.
-
- The size for the minimal base system should be determined after running
- 'aptitude clean' using 'du -hsx /'. After that the "Standard system" task
- should be installed after which the size of the standard system should be
- determined using the same method.
--->
-
 <para>
 
 <!--
 A standard installation for the i386 architecture, including all standard
-packages and using the default 2.6 kernel, takes up 442MB of disk space.
+packages and using the default 2.6 kernel, takes up &std-system-size;MB of disk space.
 A minimal base installation, without the <quote>Standard system</quote>
-task selected, will take 230MB.
+task selected, will take &base-system-size;MB.
 -->
 
 L'installazione standard sull'architettura i386, compresi tutti i pacchetti
-standard e il kernel 2.6 predefinito, richiede 442&nbsp;MB di spazio su
+standard e il kernel 2.6 predefinito, richiede &std-system-size;&nbsp;MB di spazio su
 disco. L'installazione di base minimale, senza il task <quote>Sistema
-standard</quote>, richiede 230&nbsp;MB.
+standard</quote>, richiede &base-system-size;&nbsp;MB.
 
 </para>
 <important><para>
diff --git a/ja/appendix/files.xml b/ja/appendix/files.xml
index d34baead9..250c24372 100644
--- a/ja/appendix/files.xml
+++ b/ja/appendix/files.xml
@@ -246,46 +246,18 @@ when your mouse only has one button. Just add the following lines to
  <title>Disk Space Needed for Tasks</title>
 -->
  <title>��������ɬ�פʥǥ������ζ�������</title>
-
-<!-- Note for d-i and manual maintainers
- Sizes of tasks should be determined by running tasksel with the "new-install"
- option on a system that been fully installed without selecting any tasks. By
- selecting a task together with the "manual selection" option, aptitude will
- be started and show the sizes for the task. Use "cancel pending actions" to
- clear the slate, quit aptitude and repeat for other tasks.
- Space requirements need to be determined from tasksel as tasksel will not
- install recommended packages while selecting a task from aptitude will.
-
- The size for the minimal base system should be determined after running
- 'aptitude clean' using 'du -hsx /'. After that the "Standard system" task
- should be installed after which the size of the standard system should be
- determined using the same method.
- d-i���ޥ˥奢����ƥʸ�����
- ������Υ����������򤻤��˥��󥹥ȡ��뤷�����֤� tasksel �� "new-install" 
- ���ץ�����Ĥ��Ƽ¹Ԥ����������Υ���������ꤷ�Ƥ���������
- "manual selection" ���ץ������Ѥ��ƥ����������򤷤褦�Ȥ���ȡ�
- aptitude ���������Ѥ˵�ư���ơ��������򼨤��ޤ���
- "cancel pending actions" �����������Ƥ���������
- ɬ�פʶ����ΰ�ϡ�aptitude ���饿���������򤷤����Τ褦�ˡ�
- tasksel ���侩�ѥå������򥤥󥹥ȡ��뤷�ʤ����֤Ƿ��ꤹ��ɬ�פ�����ޤ���
-
- ���ܥ����ƥ�Υ������ϡ�'aptitude clean' ��¹Ԥ�����ǡ�
- 'du -hsx /' ��¬�ꤹ��٤��Ǥ����ޤ� standard system �Υ������ϡ�
- Ʊ����ˡ�� "Standard system" �������Υ��󥹥ȡ�����¬�ꤹ��٤��Ǥ���
--->
-
 <para>
 
 <!--
 A standard installation for the i386 architecture, including all standard
-packages and using the default 2.6 kernel, takes up 442MB of disk space.
+packages and using the default 2.6 kernel, takes up &std-system-size;MB of disk space.
 A minimal base installation, without the <quote>Standard system</quote>
-task selected, will take 230MB.
+task selected, will take &base-system-size;MB.
 -->
 i386 �������ƥ��������ɸ��ѥå�������ޤ�ɸ�।�󥹥ȡ���ǡ�
-�ǥե���Ȥ� 2.6 �����ͥ���Ѥ���ȡ�442MB �ʾ�Υǥ������ΰ��ɬ�פȤ��ޤ���
+�ǥե���Ȥ� 2.6 �����ͥ���Ѥ���ȡ�&std-system-size;MB �ʾ�Υǥ������ΰ��ɬ�פȤ��ޤ���
 <quote>ɸ�ॷ���ƥ�</quote>�����������򤷤ʤ��Ǿ��δ��ܥ��󥹥ȡ���Ǥϡ�
-230MB ɬ�פǤ��礦��
+&base-system-size;MB ɬ�פǤ��礦��
 
 </para>
 <important><para>
diff --git a/nl/appendix/files.xml b/nl/appendix/files.xml
index b464dc9e7..900bfb2d0 100644
--- a/nl/appendix/files.xml
+++ b/nl/appendix/files.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 44406 untranslated -->
+<!-- original version: 44436 untranslated -->
 
 
  <sect1 id="linuxdevices"><title>Linux Devices</title>
@@ -199,28 +199,12 @@ when your mouse only has one button. Just add the following lines to
 
  <sect1 id="tasksel-size-list">
  <title>Disk Space Needed for Tasks</title>
-
-<!-- Note for d-i and manual maintainers
- Sizes of tasks should be determined by running tasksel with the "new-install"
- option on a system that been fully installed without selecting any tasks. By
- selecting a task together with the "manual selection" option, aptitude will
- be started and show the sizes for the task. Use "cancel pending actions" to
- clear the slate, quit aptitude and repeat for other tasks.
- Space requirements need to be determined from tasksel as tasksel will not
- install recommended packages while selecting a task from aptitude will.
-
- The size for the minimal base system should be determined after running
- 'aptitude clean' using 'du -hsx /'. After that the "Standard system" task
- should be installed after which the size of the standard system should be
- determined using the same method.
--->
-
 <para>
 
 A standard installation for the i386 architecture, including all standard
-packages and using the default 2.6 kernel, takes up 442MB of disk space.
+packages and using the default 2.6 kernel, takes up &std-system-size;MB of disk space.
 A minimal base installation, without the <quote>Standard system</quote>
-task selected, will take 230MB.
+task selected, will take &base-system-size;MB.
 
 </para>
 <important><para>
@@ -263,9 +247,9 @@ is (temporarily) required in <filename>/var</filename>.
 <tbody>
 <row>
   <entry>Desktop environment</entry>
-  <entry>1267</entry>
-  <entry>420</entry>
-  <entry>1667</entry>
+  <entry>&task-desktop-inst;</entry>
+  <entry>&task-desktop-dl;</entry>
+  <entry>&task-desktop-tot;</entry>
 </row>
 
 <row>
@@ -278,51 +262,51 @@ is (temporarily) required in <filename>/var</filename>.
   </para>
 
   </footnote></entry>
-  <entry>50</entry>
-  <entry>17</entry>
-  <entry>67</entry>
+  <entry>&task-laptop-inst;</entry>
+  <entry>&task-laptop-dl;</entry>
+  <entry>&task-laptop-tot;</entry>
 </row>
 
 <row>
   <entry>Web server</entry>
-  <entry>35</entry>
-  <entry>11</entry>
-  <entry>46</entry>
+  <entry>&task-web-inst;</entry>
+  <entry>&task-web-dl;</entry>
+  <entry>&task-web-tot;</entry>
 </row>
 
 <row>
   <entry>Print server</entry>
-  <entry>277</entry>
-  <entry>79</entry>
-  <entry>356</entry>
+  <entry>&task-print-inst;</entry>
+  <entry>&task-print-dl;</entry>
+  <entry>&task-print-tot;</entry>
 </row>
 
 <row>
   <entry>DNS server</entry>
-  <entry>2</entry>
-  <entry>1</entry>
-  <entry>3</entry>
+  <entry>&task-dns-inst;</entry>
+  <entry>&task-dns-dl;</entry>
+  <entry>&task-dns-tot;</entry>
 </row>
 
 <row>
   <entry>File server</entry>
-  <entry>49</entry>
-  <entry>21</entry>
-  <entry>70</entry>
+  <entry>&task-file-inst;</entry>
+  <entry>&task-file-dl;</entry>
+  <entry>&task-file-tot;</entry>
 </row>
 
 <row>
   <entry>Mail server</entry>
-  <entry>13</entry>
-  <entry>5</entry>
-  <entry>18</entry>
+  <entry>&task-mail-inst;</entry>
+  <entry>&task-mail-dl;</entry>
+  <entry>&task-mail-tot;</entry>
 </row>
 
 <row>
   <entry>SQL database</entry>
-  <entry>24</entry>
-  <entry>8</entry>
-  <entry>32</entry>
+  <entry>&task-sql-inst;</entry>
+  <entry>&task-sql-dl;</entry>
+  <entry>&task-sql-tot;</entry>
 </row>
 
 </tbody>
diff --git a/pt_BR/appendix/files.xml b/pt_BR/appendix/files.xml
index 0a9080e68..304ae5ab3 100644
--- a/pt_BR/appendix/files.xml
+++ b/pt_BR/appendix/files.xml
@@ -194,29 +194,12 @@ seguinte linhas no seu arquivo
 
  <sect1 id="tasksel-size-list">
  <title>Espaço em Disco Necessário para as Tarefas (tasks)</title>
-
-
-<!-- Note for d-i and manual maintainers
- Sizes of tasks should be determined by running tasksel with the "new-install"
- option on a system that been fully installed without selecting any tasks. By
- selecting a task together with the "manual selection" option, aptitude will
- be started and show the sizes for the task. Use "cancel pending actions" to
- clear the slate, quit aptitude and repeat for other tasks.
- Space requirements need to be determined from tasksel as tasksel will not
- install recommended packages while selecting a task from aptitude will.
-
- The size for the minimal base system should be determined after running
- 'aptitude clean' using 'du -hsx /'. After that the "Standard system" task
- should be installed after which the size of the standard system should be
- determined using the same method.
--->
-
 <para>
 
 Uma instalação padrão para a arquitetura i386, incluindo todos os pacotes
-padrão (<quote>standard</quote>) e usando o kernel padrão 2.6, ocupa 442MB
+padrão (<quote>standard</quote>) e usando o kernel padrão 2.6, ocupa &std-system-size;MB
 de espaço em disco. Uma instalação mínima, sem a tarefa
-<quote>Sistema padrão</quote> selecionada, ocupará 230MB.
+<quote>Sistema padrão</quote> selecionada, ocupará &base-system-size;MB.
 
 </para>
 <important><para>