Translation.

diff --git a/Debian/debiâneries/installeur-debian-dans-un-nuage-2.en.po b/Debian/debiâneries/installeur-debian-dans-un-nuage-2.en.po
index 50b32feb87aa105123cec293706a5fb3863b0185..d17b4997885925f5abe2ea7d27a74a18cc713ed5 100644 (file)
--- a/Debian/debiâneries/installeur-debian-dans-un-nuage-2.en.po
+++ b/Debian/debiâneries/installeur-debian-dans-un-nuage-2.en.po
@@ -2,11 +2,12 @@
 # Copyright (C) YEAR Free Software Foundation, Inc.
 # This file is distributed under the same license as the PACKAGE package.
 # Charles Plessy <foo>, 2013.
+# Charles Plessy <foo>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "POT-Creation-Date: 2013-01-19 02:10+0000\n"
-"PO-Revision-Date: 2013-01-19 10:10+0900\n"
+"PO-Revision-Date: 2013-01-19 12:00+0900\n"
 "Last-Translator: Charles Plessy <foo>\n"
 "Language-Team: bar\n"
 "Language: en\n"
@@ -37,7 +38,7 @@ msgid "[[!meta title=\"L'installeur Debian dans un nuage, part 2.\"]]\n"
 msgstr "[[!meta title=\"Debian-Installer in a Cloud, part 2.\"]]\n"
 
 #. type: Plain text
-#, fuzzy, no-wrap
+#, no-wrap
 #| msgid "J'arrive enfin à créer une [[image machine de l'installeur Debian|installeur-debian-dans-un-nuage]] automatiquement, sans qu'aucune clé ou mot de passe ne transite dans le réseau ni sur le Nuage."
 msgid ""
 "J'arrive enfin à créer une [[image machine de l'installeur\n"
@@ -46,10 +47,15 @@ msgid ""
 "`ec2-api-tools`, qui ne sont pas libre.  Merci à Eucalyptus pour avoir\n"
 "implémenté l'attribut `InstanceInitiatedShutdownBehavior` dans [[!debpkg\n"
 "euca2ools]] 2.2.\n"
-msgstr "At last I manage to create an [[image of the Debian Installer|installeur-debian-dans-un-nuage]] automatically, with no key or password transiting on the Cloud or the network."
+msgstr ""
+"I finally manage to create an [[image of the Debian Installer|installeur-"
+"debian-dans-un-nuage]] automatically, with no key or password transiting on "
+"the Cloud or the network, and without using the `ec2-api-tools`, which are "
+"_non-Free_.  Thanks to Eucalyptus for implementing the attribute "
+"`InstanceInitiatedShutdownBehavior` in [[!debpkg\n"
+"euca2ools]] 2.2.\n"
 
 #. type: Plain text
-#, fuzzy
 #| msgid ""
 #| "Pour ce faire, je démarre une micro-instance avec un volume "
 #| "supplémentaire, et je lui passe un script via [[cloud-init]], qui va "
@@ -61,12 +67,12 @@ msgid ""
 "Debian sur ce volume et éteindre la micro instance.  Ensuite, j'enregistre "
 "ce volume comme image machine."
 msgstr ""
-"In brief, I start a micro-instance with an additional volume, I pass it a "
-"script for [[cloud-init]], which will download the Installer on the volume "
-"and shut down the instance.  Then, I register the volume as a machine image."
+"In brief, I start a micro-instance with an additional volume, and I pass it "
+"a script for [[cloud-init]], which will download the Installer on the volume "
+"and shut down the instance.  Then, I register the volume as a machine "
+"image."
 
 #. type: Plain text
-#, fuzzy
 #| msgid ""
 #| "Les images machines de l'Installeur créées ainsi peuvent être démarrées "
 #| "avec une pré-configuration pour installer Debian sur un autre volume.  Je "
@@ -79,12 +85,13 @@ msgid ""
 "autre volume.  Je bute encore sur cette pré-configuration.  Plus de détails "
 "dans un prochain article.  En attendant, voici les commandes que j'utilise."
 msgstr ""
-"Those machine images of the Installer are to be preseeded to install Debian "
-"on another volume.  I am still struggling with the pre-configuration.  More "
-"details will follow in the next article."
+"Those machine images of the Installer are to be preseeded via [instance "
+"metadata](http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/AESDG-chapter-"
+"instancedata.html) to install Debian on another volume.  I am still "
+"struggling with the pre-configuration.  More details will follow in the next "
+"article.  In the meantime, here are the commands I a using."
 
 #. type: Plain text
-#, fuzzy
 #| msgid ""
 #| "Depuis l'ordinateur local, lancer une instance sur le Nuage.  Pour le "
 #| "moment il faut utiliser une image Ubuntu en attendant que cloud-init soit "
@@ -94,21 +101,21 @@ msgid ""
 "image Ubuntu en attendant que [[!debbug 696595]] sont réglé et que cloud-"
 "init soit installé par défaut sur les images Debian."
 msgstr ""
-"On the local computer, start an instance on the Cloud.  Until (http://bugs."
-"debian.org/696595) is fixed and cloud-init is installed by default, I use a "
-"Ubuntu image."
+"On the local computer, start an instance on the Cloud.  Until [[!debbug "
+"696595]] is fixed and cloud-init is installed by default, I use a Ubuntu "
+"image."
 
 #. type: Plain text
-#, fuzzy, no-wrap
+#, no-wrap
 #| msgid ""
 #| "<pre>\n"
 #| "HELPER_AMI=ami-7609bb77 # Ubuntu 12.04 LTS Precise amd64 EBS in Tôkyô\n"
 #| "</pre>\n"
 msgid "    HELPER_AMI=ami-7609bb77 # Ubuntu 12.04 LTS Precise amd64 EBS in (Asie Nord-Est)\n"
 msgstr ""
-"<pre>\n"
-"HELPER_AMI=ami-7609bb77 # Ubuntu 12.04 LTS Precise amd64 EBS in Tôkyô\n"
-"</pre>\n"
+"    HELPER_AMI=ami-7609bb77 # Ubuntu 12.04 LTS Precise amd64 EBS (Asia "
+"North-East)\n"
+"\n"
 
 #. type: Plain text
 msgid ""
@@ -116,9 +123,12 @@ msgid ""
 "après l'extinction de l'instance (`/dev/sdb=:1:false`).  On lui passe le "
 "script `debigen-install-installer-cloud` (voir plus bas)."
 msgstr ""
+"Start the instance with an extra volume of 1 GiB, which will persist after "
+"termination (`/dev/sdb=:1:false`).  Pass the script `debigen-install-"
+"installer-cloud` (see below)."
 
 #. type: Plain text
-#, fuzzy, no-wrap
+#, no-wrap
 #| msgid ""
 #| "<pre>\n"
 #| "HELPER_INSTANCE=$( euca-run-instances \\\n"
@@ -138,23 +148,20 @@ msgid ""
 "            $HELPER_AMI |\n"
 "            tee /dev/stderr | grep INSTANCE | awk '{print $2}')\n"
 msgstr ""
-"<pre>\n"
-"HELPER_INSTANCE=$( euca-run-instances \\\n"
-"        --instance-initiated-shutdown-behavior terminate \\\n"
-"        --instance-type t1.micro \\\n"
-"        --block-device-mapping /dev/sdb=:1:false \\\n"
-"        --user-data-file debigen-install-installer-cloud \\\n"
-"        $HELPER_AMI |\n"
-"        tee /dev/stderr | grep INSTANCE | awk '{print $2}')\n"
-"</pre>\n"
-"\n"
+"    HELPER_INSTANCE=$( euca-run-instances \\\n"
+"            --instance-initiated-shutdown-behavior terminate \\\n"
+"            --instance-type t1.micro \\\n"
+"            --block-device-mapping /dev/sdb=:1:false \\\n"
+"            --user-data-file debigen-install-installer-cloud \\\n"
+"            $HELPER_AMI |\n"
+"            tee /dev/stderr | grep INSTANCE | awk '{print $2}')\n"
 
 #. type: Plain text
 msgid "On attend que le démarrage soit fini"
 msgstr "Wait that the boot finished."
 
 #. type: Plain text
-#, fuzzy, no-wrap
+#, no-wrap
 #| msgid ""
 #| "<pre>\n"
 #| "while [ ! $(euca-describe-instances $HELPER_INSTANCE | grep INSTANCE | cut -f 6 | tee /dev/stderr) = \"running\" ]; do sleep 30; done\n"
@@ -164,17 +171,17 @@ msgid ""
 "        do sleep 30\n"
 "    done\n"
 msgstr ""
-"<pre>\n"
-"while [ ! $(euca-describe-instances $HELPER_INSTANCE | grep INSTANCE | cut -f 6 | tee /dev/stderr) = \"running\" ]; do sleep 30; done\n"
-"</pre>\n"
-"\n"
+"    while [ ! $(euca-describe-instances $HELPER_INSTANCE | grep INSTANCE | "
+"cut -f 6 | tee /dev/stderr) = \"running\" ]\n"
+"        do sleep 30\n"
+"    done"
 
 #. type: Plain text
 msgid "On récupère le numéro du volume persistant."
 msgstr "Get the volume's identifier"
 
 #. type: Plain text
-#, fuzzy, no-wrap
+#, no-wrap
 #| msgid ""
 #| "<pre>\n"
 #| "TARGET_VOLUME=$( euca-describe-volumes |\n"
@@ -186,18 +193,16 @@ msgid ""
 "            grep $HELPER_INSTANCE | grep '/dev/sdb' |\n"
 "            tee /dev/stderr | awk '{print $2}')\n"
 msgstr ""
-"<pre>\n"
-"TARGET_VOLUME=$( euca-describe-volumes |\n"
-"        grep $HELPER_INSTANCE | grep '/dev/sdb' |\n"
-"        tee /dev/stderr | awk '{print $2}')\n"
-"</pre>\n"
+"    TARGET_VOLUME=$( euca-describe-volumes |\n"
+"            grep $HELPER_INSTANCE | grep '/dev/sdb' |\n"
+"            tee /dev/stderr | awk '{print $2}')\n"
 
 #. type: Plain text
 msgid "On attend que le script termine l'instance."
 msgstr "Wait that the scripts shuts down the instance."
 
 #. type: Plain text
-#, fuzzy, no-wrap
+#, no-wrap
 #| msgid ""
 #| "<pre>\n"
 #| "while [ ! $(euca-describe-instances $HELPER_INSTANCE | grep INSTANCE | cut -f 6 | tee /dev/stderr) = \"terminated\" ]; do sleep 30; done\n"
@@ -207,12 +212,12 @@ msgid ""
 "        do sleep 30\n"
 "    done\n"
 msgstr ""
-"<pre>\n"
-"while [ ! $(euca-describe-instances $HELPER_INSTANCE | grep INSTANCE | cut -f 6 | tee /dev/stderr) = \"terminated\" ]; do sleep 30; done\n"
-"</pre>\n"
+"    while [ ! $(euca-describe-instances $HELPER_INSTANCE | grep INSTANCE | "
+"cut -f 6 | tee /dev/stderr) = \"terminated\" ]\n"
+"        do sleep 30\n"
+"    done\n"
 
 #. type: Plain text
-#, fuzzy
 #| msgid ""
 #| "Et enfin, on enregistre une images à partir d'un instantané du volume.  "
 #| "(Notez que `PV_KERNEL=aki-44992845` est pour la région de Tôkyô."
@@ -222,10 +227,10 @@ msgstr "Snapshot the volume and register it as a machine image."
 #. type: Plain text
 #, no-wrap
 msgid "    PV_KERNEL=aki-44992845 # Démarre PV-Grub sur hd0 (Asie Nord-Est)\n"
-msgstr ""
+msgstr "    PV_KERNEL=aki-44992845 # Boot PV-Grub on hd0 (Asia North-East)"
 
 #. type: Plain text
-#, fuzzy, no-wrap
+#, no-wrap
 #| msgid ""
 #| "TARGET_SNAPSHOT=$( euca-create-snapshot $TARGET_VOLUME |\n"
 #| "        tee /dev/stderr | awk '{print $2}')\n"
@@ -233,17 +238,18 @@ msgid ""
 "    TARGET_SNAPSHOT=$( euca-create-snapshot $TARGET_VOLUME |\n"
 "            tee /dev/stderr | awk '{print $2}')\n"
 msgstr ""
-"TARGET_SNAPSHOT=$( euca-create-snapshot $TARGET_VOLUME |\n"
-"        tee /dev/stderr | awk '{print $2}')"
+"   TARGET_SNAPSHOT=$( euca-create-snapshot $TARGET_VOLUME |\n"
+"            tee /dev/stderr | awk '{print $2}')\n"
 
 #. type: Plain text
-#, fuzzy, no-wrap
+#, no-wrap
 #| msgid "while euca-describe-snapshots $TARGET_SNAPSHOT | grep -q pending ; do sleep 30 ; done"
 msgid "    while euca-describe-snapshots $TARGET_SNAPSHOT | grep -q pending ; do sleep 30 ; done\n"
-msgstr "while euca-describe-snapshots $TARGET_SNAPSHOT | grep -q pending ; do sleep 30 ; done"
+msgstr "    while euca-describe-snapshots $TARGET_SNAPSHOT | grep -q pending ; do "
+"sleep 30 ; done\n"
 
 #. type: Plain text
-#, fuzzy, no-wrap
+#, no-wrap
 #| msgid ""
 #| "INSTALLER_IMAGE=$( euca-register \\\n"
 #| "        --name test_di \\\n"
@@ -261,14 +267,12 @@ msgid ""
 "        --kernel $PV_KERNEL \\\n"
 "        --architecture x86_64\n"
 msgstr ""
-"INSTALLER_IMAGE=$( euca-register \\\n"
+"    euca-register \\\n"
 "        --name test_di \\\n"
 "        --description test_of_debian_installer \\\n"
 "        --snapshot $TARGET_SNAPSHOT \\\n"
 "        --kernel $PV_KERNEL \\\n"
-"        --architecture x86_64 |\n"
-"        tee /dev/stderr | awk '{print $2}')\n"
-"</pre>"
+"        --architecture x86_64\n"
 
 #. type: Plain text
 msgid ""
@@ -278,7 +282,7 @@ msgstr "Here is the script called debigen-install-installer-cloud, used above."
 #. type: Plain text
 #, no-wrap
 msgid "    #!/bin/sh -ex\n"
-msgstr ""
+msgstr "    #!/bin/sh -ex"
 
 #. type: Plain text
 #, no-wrap
@@ -286,11 +290,13 @@ msgid ""
 "    mke2fs -L debian-installer /dev/xvdb -F\n"
 "    mount LABEL=debian-installer /mnt/\n"
 msgstr ""
+"    mke2fs -L debian-installer /dev/xvdb -F\n"
+"    mount LABEL=debian-installer /mnt/\n"
 
 #. type: Plain text
 #, no-wrap
 msgid "    cd /mnt\n"
-msgstr ""
+msgstr "    cd /mnt"
 
 #. type: Plain text
 #, no-wrap
@@ -301,16 +307,22 @@ msgid ""
 "    MIRROR=jp\n"
 "    BASEURL=http://ftp.$MIRROR.debian.org/debian/dists/$DIST/main/installer-$ARCH/$DI_VERSION/images/netboot/xen\n"
 msgstr ""
+"    ARCH=amd64\n"
+"    DIST=squeeze\n"
+"    DI_VERSION=20110106+squeeze4+b2\n"
+"    MIRROR=jp\n"
+"    BASEURL=http://ftp.$MIRROR.debian.org/debian/dists/$DIST/main/installer-"
+"$ARCH/$DI_VERSION/images/netboot/xen\n"
 
 #. type: Plain text
 #, no-wrap
 msgid "    wget $BASEURL/initrd.gz $BASEURL/vmlinuz\n"
-msgstr ""
+msgstr "    wget $BASEURL/initrd.gz $BASEURL/vmlinuz"
 
 #. type: Plain text
 #, no-wrap
 msgid "    mkdir -p boot/grub\n"
-msgstr ""
+msgstr "    mkdir -p boot/grub"
 
 #. type: Plain text
 #, no-wrap
@@ -319,6 +331,9 @@ msgid ""
 "    default 0\n"
 "    timeout 3\n"
 msgstr ""
+"    cat > boot/grub/menu.lst <<__END__\n"
+"    default 0\n"
+"    timeout 3\n"
 
 #. type: Plain text
 #, no-wrap
@@ -329,11 +344,18 @@ msgid ""
 "    initrd /initrd.gz\n"
 "    __END__\n"
 msgstr ""
+"    title  Debian Installer ($DI_VERSION $ARCH)\n"
+"    root   (hd0)\n"
+"    kernel /vmlinuz root=LABEL=debian-installer ro console=hvc0 auto=true "
+"priority=critical url=http://169.254.169.254/latest/user-data "
+"DEBIAN_FRONTEND=text\n"
+"    initrd /initrd.gz\n"
+"    __END__\n"
 
 #. type: Plain text
 #, no-wrap
 msgid "    halt\n"
-msgstr ""
+msgstr "    halt"
 
 #~ msgid ""
 #~ "En attendant, voici les commandes que j'utilise.  Mettez-les ensembles et "